From bfa4a5c5e2ba53d3f3dcc8e9ecf73dc6e0c78882 Mon Sep 17 00:00:00 2001 From: Ibrahim BinAlshikh Date: Tue, 7 Oct 2025 19:08:41 +0300 Subject: [PATCH 01/45] refactor: Moved Core Files --- tests/{webfiori => webfiori - Copy}/benchmark/RouterBench.php | 0 .../{webfiori => webfiori - Copy}/framework/test/AccessTest.php | 0 .../framework/test/ClassUtilTest.php | 0 tests/{webfiori => webfiori - Copy}/framework/test/DBTest.php | 0 tests/{webfiori => webfiori - Copy}/framework/test/PageTest.php | 0 .../framework/test/PrivilegeTest.php | 0 .../framework/test/PrivilegesGroupTest.php | 0 .../framework/test/ResponseTest.php | 0 .../framework/test/TestAutoLoader.php | 0 tests/{webfiori => webfiori - Copy}/framework/test/UserTest.php | 0 tests/{webfiori => webfiori - Copy}/framework/test/UtilTest.php | 0 .../framework/test/cli/AddCommandTest.php | 0 .../framework/test/cli/CreateAPITestCaseTest.php | 0 .../framework/test/cli/CreateCLICommandTest.php | 0 .../framework/test/cli/CreateCommandTest.php | 0 .../framework/test/cli/CreateDBAccessTest.php | 0 .../framework/test/cli/CreateEntityTest.php | 0 .../framework/test/cli/CreateMiddlewareTest.php | 0 .../framework/test/cli/CreateMigrationTest.php | 0 .../framework/test/cli/CreateRESTTest.php | 0 .../framework/test/cli/CreateTableTest.php | 0 .../framework/test/cli/CreateTaskTest.php | 0 .../framework/test/cli/CreateThemeTest.php | 0 .../framework/test/cli/CreateWebServiceTest.php | 0 .../framework/test/cli/DBClassWritterTest.php | 0 .../framework/test/cli/HelpCommandTest.php | 0 .../framework/test/cli/ListRoutesCommandTest.php | 0 .../framework/test/cli/ListThemesCommandTest.php | 0 .../framework/test/cli/RunMigrationsCommandTest.php | 0 .../framework/test/cli/RunSQLCommandTest.php | 0 .../framework/test/cli/SchedulerCommandTest.php | 0 .../framework/test/cli/SettingsCommandTest.php | 0 .../framework/test/cli/UpdateSettingsCommandTest.php | 0 .../framework/test/cli/UpdateTableCommandTest.php | 0 .../framework/test/cli/VersionCommandTest.php | 0 .../framework/test/config/JsonDriverTest.php | 0 .../framework/test/langs/LanguageTest.php | 0 .../framework/test/mail/EmailMessageTest.php | 0 .../framework/test/router/RouterTest.php | 0 .../framework/test/router/RouterUriTest.php | 0 .../framework/test/scheduler/JobArgumentTest.php | 0 .../framework/test/scheduler/SchedulerTaskTest.php | 0 .../framework/test/scheduler/SchedulerTest.php | 0 .../framework/test/session/SessionTest.php | 0 .../framework/test/session/SessionsManagerTest.php | 0 .../framework/test/theme/ThemeTest.php | 0 .../framework/test/writers/BackgroundTaskWritterTest.php | 0 .../framework/test/writers/CLICommandClassWriterTest.php | 0 .../framework/test/writers/DatabaseMigrationWriterTest.php | 0 .../framework/test/writers/LangWritterTest.php | 0 .../framework/test/writers/MiddlewareWritterTest.php | 0 .../framework/test/writers/TableWritterTest.php | 0 .../framework/test/writers/ThemeWritterTest.php | 0 .../framework/test/writers/WebServiceTestCaseWriterTest.php | 0 .../framework/test/writers/WebServiceWritterTest.php | 0 tests/webfiori/framework/scheduler/webServices/temp | 1 - {webfiori => webfiori - Copy}/framework/Access.php | 0 {webfiori => webfiori - Copy}/framework/App.php | 0 {webfiori => webfiori - Copy}/framework/DB.php | 0 {webfiori => webfiori - Copy}/framework/EmailMessage.php | 0 .../framework/ExtendedWebServicesManager.php | 0 {webfiori => webfiori - Copy}/framework/Ini.php | 0 {webfiori => webfiori - Copy}/framework/Lang.php | 0 {webfiori => webfiori - Copy}/framework/Privilege.php | 0 {webfiori => webfiori - Copy}/framework/PrivilegesGroup.php | 0 {webfiori => webfiori - Copy}/framework/Theme.php | 0 {webfiori => webfiori - Copy}/framework/ThemeManager.php | 0 {webfiori => webfiori - Copy}/framework/User.php | 0 {webfiori => webfiori - Copy}/framework/Util.php | 0 {webfiori => webfiori - Copy}/framework/autoload/ClassInfo.php | 0 {webfiori => webfiori - Copy}/framework/autoload/ClassLoader.php | 0 .../framework/autoload/ClassLoaderException.php | 0 {webfiori => webfiori - Copy}/framework/cli/CLITestCase.php | 0 {webfiori => webfiori - Copy}/framework/cli/CLIUtils.php | 0 .../framework/cli/commands/AddCommand.php | 0 .../framework/cli/commands/CreateCommand.php | 0 .../framework/cli/commands/ListRoutesCommand.php | 0 .../framework/cli/commands/ListThemesCommand.php | 0 .../framework/cli/commands/RunMigrationsCommand.php | 0 .../framework/cli/commands/RunSQLQueryCommand.php | 0 .../framework/cli/commands/SchedulerCommand.php | 0 .../framework/cli/commands/SettingsCommand.php | 0 .../framework/cli/commands/UpdateSettingsCommand.php | 0 .../framework/cli/commands/UpdateTableCommand.php | 0 .../framework/cli/commands/VersionCommand.php | 0 .../framework/cli/commands/WHelpCommand.php | 0 .../framework/cli/helpers/ClassInfoReader.php | 0 .../framework/cli/helpers/CreateAPITestCase.php | 0 .../framework/cli/helpers/CreateBackgroundTask.php | 0 .../framework/cli/helpers/CreateCLIClassHelper.php | 0 .../framework/cli/helpers/CreateClassHelper.php | 0 .../framework/cli/helpers/CreateDBAccessHelper.php | 0 .../framework/cli/helpers/CreateFullRESTHelper.php | 0 .../framework/cli/helpers/CreateMiddleware.php | 0 .../framework/cli/helpers/CreateMigration.php | 0 .../framework/cli/helpers/CreateTableObj.php | 0 .../framework/cli/helpers/CreateThemeHelper.php | 0 .../framework/cli/helpers/CreateWebService.php | 0 .../framework/cli/helpers/TableObjHelper.php | 0 {webfiori => webfiori - Copy}/framework/config/ClassDriver.php | 0 .../framework/config/ConfigurationDriver.php | 0 {webfiori => webfiori - Copy}/framework/config/Controller.php | 0 {webfiori => webfiori - Copy}/framework/config/JsonDriver.php | 0 .../framework/exceptions/ArrayIndexOutOfBoundsException.php | 0 .../framework/exceptions/InitializationException.php | 0 .../framework/exceptions/InvalidCRONExprException.php | 0 .../framework/exceptions/MissingLangException.php | 0 .../framework/exceptions/NoSuchThemeException.php | 0 .../framework/exceptions/RoutingException.php | 0 .../framework/exceptions/SessionException.php | 0 .../framework/exceptions/UIException.php | 0 .../framework/handlers/APICallErrHandler.php | 0 .../framework/handlers/CLIErrHandler.php | 0 .../framework/handlers/HTTPErrHandler.php | 0 .../framework/middleware/AbstractMiddleware.php | 0 .../framework/middleware/CacheMiddleware.php | 0 .../framework/middleware/MiddlewareManager.php | 0 .../framework/middleware/StartSessionMiddleware.php | 0 {webfiori => webfiori - Copy}/framework/router/RouteOption.php | 0 {webfiori => webfiori - Copy}/framework/router/Router.php | 0 {webfiori => webfiori - Copy}/framework/router/RouterUri.php | 0 .../framework/scheduler/AbstractTask.php | 0 {webfiori => webfiori - Copy}/framework/scheduler/BaseTask.php | 0 .../framework/scheduler/TaskArgument.php | 0 .../framework/scheduler/TaskStatusEmail.php | 0 .../framework/scheduler/TasksManager.php | 0 .../scheduler/webServices/ForceTaskExecutionService.php | 0 .../framework/scheduler/webServices/GetTasksService.php | 0 .../framework/scheduler/webServices/PrivateSchedulerService.php | 0 .../framework/scheduler/webServices/SetupPasswordService.php | 0 .../framework/scheduler/webServices/TasksLoginService.php | 0 .../framework/scheduler/webServices/TasksLogoutService.php | 0 .../framework/scheduler/webServices/TasksServicesManager.php | 0 .../framework/scheduler/webUI/BaseTasksPage.php | 0 .../framework/scheduler/webUI/ListTasksPage.php | 0 .../framework/scheduler/webUI/SetPasswordPage.php | 0 .../framework/scheduler/webUI/TasksLoginPage.php | 0 .../framework/scheduler/webUI/TasksTable.php | 0 .../scheduler/webUI/templates/job-execution-status-dialog.html | 0 .../framework/scheduler/webUI/templates/job-output-dialog.html | 0 .../framework/scheduler/webUI/templates/login-form.html | 0 .../framework/scheduler/webUI/templates/message-dialog.html | 0 .../framework/scheduler/webUI/templates/scheduler-head.php | 0 .../framework/scheduler/webUI/templates/set-password-form.html | 0 .../framework/scheduler/webUI/templates/tasks-table.html | 0 .../framework/session/DatabaseSessionStorage.php | 0 .../framework/session/DefaultSessionStorage.php | 0 .../framework/session/MSSQLSessionDataTable.php | 0 .../framework/session/MSSQLSessionsTable.php | 0 .../framework/session/MySQLSessionDataTable.php | 0 .../framework/session/MySQLSessionsTable.php | 0 {webfiori => webfiori - Copy}/framework/session/Session.php | 0 {webfiori => webfiori - Copy}/framework/session/SessionDB.php | 0 .../framework/session/SessionOption.php | 0 .../framework/session/SessionStatus.php | 0 .../framework/session/SessionStorage.php | 0 {webfiori => webfiori - Copy}/framework/session/SessionUser.php | 0 .../framework/session/SessionsManager.php | 0 .../framework/ui/BeforeRenderCallback.php | 0 {webfiori => webfiori - Copy}/framework/ui/HTTPCodeView.php | 0 {webfiori => webfiori - Copy}/framework/ui/MessageBox.php | 0 {webfiori => webfiori - Copy}/framework/ui/StarterPage.php | 0 {webfiori => webfiori - Copy}/framework/ui/WebPage.php | 0 .../framework/ui/serverErrPage/ServerErrPage.php | 0 .../framework/ui/serverErrPage/error-details.php | 0 .../framework/ui/serverErrPage/server-err-head.php | 0 .../framework/ui/serverErrPage/server-err-header.php | 0 .../framework/ui/serverErrPage/server-err-stack-trace.php | 0 {webfiori => webfiori - Copy}/framework/ui/ui-functions.php | 0 .../framework/writers/APITestCaseWriter.php | 0 {webfiori => webfiori - Copy}/framework/writers/ClassWriter.php | 0 .../framework/writers/CommandClassWriter.php | 0 .../framework/writers/DBClassWriter.php | 0 .../framework/writers/DatabaseMigrationWriter.php | 0 .../framework/writers/LangClassWriter.php | 0 .../framework/writers/MiddlewareClassWriter.php | 0 .../framework/writers/SchedulerTaskClassWriter.php | 0 .../framework/writers/ServiceHolder.php | 0 .../framework/writers/TableClassWriter.php | 0 .../framework/writers/ThemeClassWriter.php | 0 .../framework/writers/ThemeComponentWriter.php | 0 .../framework/writers/WebServiceWriter.php | 0 webfiori/db/temp | 1 - 183 files changed, 2 deletions(-) rename tests/{webfiori => webfiori - Copy}/benchmark/RouterBench.php (100%) rename tests/{webfiori => webfiori - Copy}/framework/test/AccessTest.php (100%) rename tests/{webfiori => webfiori - Copy}/framework/test/ClassUtilTest.php (100%) rename tests/{webfiori => webfiori - Copy}/framework/test/DBTest.php (100%) rename tests/{webfiori => webfiori - Copy}/framework/test/PageTest.php (100%) rename tests/{webfiori => webfiori - Copy}/framework/test/PrivilegeTest.php (100%) rename tests/{webfiori => webfiori - Copy}/framework/test/PrivilegesGroupTest.php (100%) rename tests/{webfiori => webfiori - Copy}/framework/test/ResponseTest.php (100%) rename tests/{webfiori => webfiori - Copy}/framework/test/TestAutoLoader.php (100%) rename tests/{webfiori => webfiori - Copy}/framework/test/UserTest.php (100%) rename tests/{webfiori => webfiori - Copy}/framework/test/UtilTest.php (100%) rename tests/{webfiori => webfiori - Copy}/framework/test/cli/AddCommandTest.php (100%) rename tests/{webfiori => webfiori - Copy}/framework/test/cli/CreateAPITestCaseTest.php (100%) rename tests/{webfiori => webfiori - Copy}/framework/test/cli/CreateCLICommandTest.php (100%) rename tests/{webfiori => webfiori - Copy}/framework/test/cli/CreateCommandTest.php (100%) rename tests/{webfiori => webfiori - Copy}/framework/test/cli/CreateDBAccessTest.php (100%) rename tests/{webfiori => webfiori - Copy}/framework/test/cli/CreateEntityTest.php (100%) rename tests/{webfiori => webfiori - Copy}/framework/test/cli/CreateMiddlewareTest.php (100%) rename tests/{webfiori => webfiori - Copy}/framework/test/cli/CreateMigrationTest.php (100%) rename tests/{webfiori => webfiori - Copy}/framework/test/cli/CreateRESTTest.php (100%) rename tests/{webfiori => webfiori - Copy}/framework/test/cli/CreateTableTest.php (100%) rename tests/{webfiori => webfiori - Copy}/framework/test/cli/CreateTaskTest.php (100%) rename tests/{webfiori => webfiori - Copy}/framework/test/cli/CreateThemeTest.php (100%) rename tests/{webfiori => webfiori - Copy}/framework/test/cli/CreateWebServiceTest.php (100%) rename tests/{webfiori => webfiori - Copy}/framework/test/cli/DBClassWritterTest.php (100%) rename tests/{webfiori => webfiori - Copy}/framework/test/cli/HelpCommandTest.php (100%) rename tests/{webfiori => webfiori - Copy}/framework/test/cli/ListRoutesCommandTest.php (100%) rename tests/{webfiori => webfiori - Copy}/framework/test/cli/ListThemesCommandTest.php (100%) rename tests/{webfiori => webfiori - Copy}/framework/test/cli/RunMigrationsCommandTest.php (100%) rename tests/{webfiori => webfiori - Copy}/framework/test/cli/RunSQLCommandTest.php (100%) rename tests/{webfiori => webfiori - Copy}/framework/test/cli/SchedulerCommandTest.php (100%) rename tests/{webfiori => webfiori - Copy}/framework/test/cli/SettingsCommandTest.php (100%) rename tests/{webfiori => webfiori - Copy}/framework/test/cli/UpdateSettingsCommandTest.php (100%) rename tests/{webfiori => webfiori - Copy}/framework/test/cli/UpdateTableCommandTest.php (100%) rename tests/{webfiori => webfiori - Copy}/framework/test/cli/VersionCommandTest.php (100%) rename tests/{webfiori => webfiori - Copy}/framework/test/config/JsonDriverTest.php (100%) rename tests/{webfiori => webfiori - Copy}/framework/test/langs/LanguageTest.php (100%) rename tests/{webfiori => webfiori - Copy}/framework/test/mail/EmailMessageTest.php (100%) rename tests/{webfiori => webfiori - Copy}/framework/test/router/RouterTest.php (100%) rename tests/{webfiori => webfiori - Copy}/framework/test/router/RouterUriTest.php (100%) rename tests/{webfiori => webfiori - Copy}/framework/test/scheduler/JobArgumentTest.php (100%) rename tests/{webfiori => webfiori - Copy}/framework/test/scheduler/SchedulerTaskTest.php (100%) rename tests/{webfiori => webfiori - Copy}/framework/test/scheduler/SchedulerTest.php (100%) rename tests/{webfiori => webfiori - Copy}/framework/test/session/SessionTest.php (100%) rename tests/{webfiori => webfiori - Copy}/framework/test/session/SessionsManagerTest.php (100%) rename tests/{webfiori => webfiori - Copy}/framework/test/theme/ThemeTest.php (100%) rename tests/{webfiori => webfiori - Copy}/framework/test/writers/BackgroundTaskWritterTest.php (100%) rename tests/{webfiori => webfiori - Copy}/framework/test/writers/CLICommandClassWriterTest.php (100%) rename tests/{webfiori => webfiori - Copy}/framework/test/writers/DatabaseMigrationWriterTest.php (100%) rename tests/{webfiori => webfiori - Copy}/framework/test/writers/LangWritterTest.php (100%) rename tests/{webfiori => webfiori - Copy}/framework/test/writers/MiddlewareWritterTest.php (100%) rename tests/{webfiori => webfiori - Copy}/framework/test/writers/TableWritterTest.php (100%) rename tests/{webfiori => webfiori - Copy}/framework/test/writers/ThemeWritterTest.php (100%) rename tests/{webfiori => webfiori - Copy}/framework/test/writers/WebServiceTestCaseWriterTest.php (100%) rename tests/{webfiori => webfiori - Copy}/framework/test/writers/WebServiceWritterTest.php (100%) delete mode 100644 tests/webfiori/framework/scheduler/webServices/temp rename {webfiori => webfiori - Copy}/framework/Access.php (100%) rename {webfiori => webfiori - Copy}/framework/App.php (100%) rename {webfiori => webfiori - Copy}/framework/DB.php (100%) rename {webfiori => webfiori - Copy}/framework/EmailMessage.php (100%) rename {webfiori => webfiori - Copy}/framework/ExtendedWebServicesManager.php (100%) rename {webfiori => webfiori - Copy}/framework/Ini.php (100%) rename {webfiori => webfiori - Copy}/framework/Lang.php (100%) rename {webfiori => webfiori - Copy}/framework/Privilege.php (100%) rename {webfiori => webfiori - Copy}/framework/PrivilegesGroup.php (100%) rename {webfiori => webfiori - Copy}/framework/Theme.php (100%) rename {webfiori => webfiori - Copy}/framework/ThemeManager.php (100%) rename {webfiori => webfiori - Copy}/framework/User.php (100%) rename {webfiori => webfiori - Copy}/framework/Util.php (100%) rename {webfiori => webfiori - Copy}/framework/autoload/ClassInfo.php (100%) rename {webfiori => webfiori - Copy}/framework/autoload/ClassLoader.php (100%) rename {webfiori => webfiori - Copy}/framework/autoload/ClassLoaderException.php (100%) rename {webfiori => webfiori - Copy}/framework/cli/CLITestCase.php (100%) rename {webfiori => webfiori - Copy}/framework/cli/CLIUtils.php (100%) rename {webfiori => webfiori - Copy}/framework/cli/commands/AddCommand.php (100%) rename {webfiori => webfiori - Copy}/framework/cli/commands/CreateCommand.php (100%) rename {webfiori => webfiori - Copy}/framework/cli/commands/ListRoutesCommand.php (100%) rename {webfiori => webfiori - Copy}/framework/cli/commands/ListThemesCommand.php (100%) rename {webfiori => webfiori - Copy}/framework/cli/commands/RunMigrationsCommand.php (100%) rename {webfiori => webfiori - Copy}/framework/cli/commands/RunSQLQueryCommand.php (100%) rename {webfiori => webfiori - Copy}/framework/cli/commands/SchedulerCommand.php (100%) rename {webfiori => webfiori - Copy}/framework/cli/commands/SettingsCommand.php (100%) rename {webfiori => webfiori - Copy}/framework/cli/commands/UpdateSettingsCommand.php (100%) rename {webfiori => webfiori - Copy}/framework/cli/commands/UpdateTableCommand.php (100%) rename {webfiori => webfiori - Copy}/framework/cli/commands/VersionCommand.php (100%) rename {webfiori => webfiori - Copy}/framework/cli/commands/WHelpCommand.php (100%) rename {webfiori => webfiori - Copy}/framework/cli/helpers/ClassInfoReader.php (100%) rename {webfiori => webfiori - Copy}/framework/cli/helpers/CreateAPITestCase.php (100%) rename {webfiori => webfiori - Copy}/framework/cli/helpers/CreateBackgroundTask.php (100%) rename {webfiori => webfiori - Copy}/framework/cli/helpers/CreateCLIClassHelper.php (100%) rename {webfiori => webfiori - Copy}/framework/cli/helpers/CreateClassHelper.php (100%) rename {webfiori => webfiori - Copy}/framework/cli/helpers/CreateDBAccessHelper.php (100%) rename {webfiori => webfiori - Copy}/framework/cli/helpers/CreateFullRESTHelper.php (100%) rename {webfiori => webfiori - Copy}/framework/cli/helpers/CreateMiddleware.php (100%) rename {webfiori => webfiori - Copy}/framework/cli/helpers/CreateMigration.php (100%) rename {webfiori => webfiori - Copy}/framework/cli/helpers/CreateTableObj.php (100%) rename {webfiori => webfiori - Copy}/framework/cli/helpers/CreateThemeHelper.php (100%) rename {webfiori => webfiori - Copy}/framework/cli/helpers/CreateWebService.php (100%) rename {webfiori => webfiori - Copy}/framework/cli/helpers/TableObjHelper.php (100%) rename {webfiori => webfiori - Copy}/framework/config/ClassDriver.php (100%) rename {webfiori => webfiori - Copy}/framework/config/ConfigurationDriver.php (100%) rename {webfiori => webfiori - Copy}/framework/config/Controller.php (100%) rename {webfiori => webfiori - Copy}/framework/config/JsonDriver.php (100%) rename {webfiori => webfiori - Copy}/framework/exceptions/ArrayIndexOutOfBoundsException.php (100%) rename {webfiori => webfiori - Copy}/framework/exceptions/InitializationException.php (100%) rename {webfiori => webfiori - Copy}/framework/exceptions/InvalidCRONExprException.php (100%) rename {webfiori => webfiori - Copy}/framework/exceptions/MissingLangException.php (100%) rename {webfiori => webfiori - Copy}/framework/exceptions/NoSuchThemeException.php (100%) rename {webfiori => webfiori - Copy}/framework/exceptions/RoutingException.php (100%) rename {webfiori => webfiori - Copy}/framework/exceptions/SessionException.php (100%) rename {webfiori => webfiori - Copy}/framework/exceptions/UIException.php (100%) rename {webfiori => webfiori - Copy}/framework/handlers/APICallErrHandler.php (100%) rename {webfiori => webfiori - Copy}/framework/handlers/CLIErrHandler.php (100%) rename {webfiori => webfiori - Copy}/framework/handlers/HTTPErrHandler.php (100%) rename {webfiori => webfiori - Copy}/framework/middleware/AbstractMiddleware.php (100%) rename {webfiori => webfiori - Copy}/framework/middleware/CacheMiddleware.php (100%) rename {webfiori => webfiori - Copy}/framework/middleware/MiddlewareManager.php (100%) rename {webfiori => webfiori - Copy}/framework/middleware/StartSessionMiddleware.php (100%) rename {webfiori => webfiori - Copy}/framework/router/RouteOption.php (100%) rename {webfiori => webfiori - Copy}/framework/router/Router.php (100%) rename {webfiori => webfiori - Copy}/framework/router/RouterUri.php (100%) rename {webfiori => webfiori - Copy}/framework/scheduler/AbstractTask.php (100%) rename {webfiori => webfiori - Copy}/framework/scheduler/BaseTask.php (100%) rename {webfiori => webfiori - Copy}/framework/scheduler/TaskArgument.php (100%) rename {webfiori => webfiori - Copy}/framework/scheduler/TaskStatusEmail.php (100%) rename {webfiori => webfiori - Copy}/framework/scheduler/TasksManager.php (100%) rename {webfiori => webfiori - Copy}/framework/scheduler/webServices/ForceTaskExecutionService.php (100%) rename {webfiori => webfiori - Copy}/framework/scheduler/webServices/GetTasksService.php (100%) rename {webfiori => webfiori - Copy}/framework/scheduler/webServices/PrivateSchedulerService.php (100%) rename {webfiori => webfiori - Copy}/framework/scheduler/webServices/SetupPasswordService.php (100%) rename {webfiori => webfiori - Copy}/framework/scheduler/webServices/TasksLoginService.php (100%) rename {webfiori => webfiori - Copy}/framework/scheduler/webServices/TasksLogoutService.php (100%) rename {webfiori => webfiori - Copy}/framework/scheduler/webServices/TasksServicesManager.php (100%) rename {webfiori => webfiori - Copy}/framework/scheduler/webUI/BaseTasksPage.php (100%) rename {webfiori => webfiori - Copy}/framework/scheduler/webUI/ListTasksPage.php (100%) rename {webfiori => webfiori - Copy}/framework/scheduler/webUI/SetPasswordPage.php (100%) rename {webfiori => webfiori - Copy}/framework/scheduler/webUI/TasksLoginPage.php (100%) rename {webfiori => webfiori - Copy}/framework/scheduler/webUI/TasksTable.php (100%) rename {webfiori => webfiori - Copy}/framework/scheduler/webUI/templates/job-execution-status-dialog.html (100%) rename {webfiori => webfiori - Copy}/framework/scheduler/webUI/templates/job-output-dialog.html (100%) rename {webfiori => webfiori - Copy}/framework/scheduler/webUI/templates/login-form.html (100%) rename {webfiori => webfiori - Copy}/framework/scheduler/webUI/templates/message-dialog.html (100%) rename {webfiori => webfiori - Copy}/framework/scheduler/webUI/templates/scheduler-head.php (100%) rename {webfiori => webfiori - Copy}/framework/scheduler/webUI/templates/set-password-form.html (100%) rename {webfiori => webfiori - Copy}/framework/scheduler/webUI/templates/tasks-table.html (100%) rename {webfiori => webfiori - Copy}/framework/session/DatabaseSessionStorage.php (100%) rename {webfiori => webfiori - Copy}/framework/session/DefaultSessionStorage.php (100%) rename {webfiori => webfiori - Copy}/framework/session/MSSQLSessionDataTable.php (100%) rename {webfiori => webfiori - Copy}/framework/session/MSSQLSessionsTable.php (100%) rename {webfiori => webfiori - Copy}/framework/session/MySQLSessionDataTable.php (100%) rename {webfiori => webfiori - Copy}/framework/session/MySQLSessionsTable.php (100%) rename {webfiori => webfiori - Copy}/framework/session/Session.php (100%) rename {webfiori => webfiori - Copy}/framework/session/SessionDB.php (100%) rename {webfiori => webfiori - Copy}/framework/session/SessionOption.php (100%) rename {webfiori => webfiori - Copy}/framework/session/SessionStatus.php (100%) rename {webfiori => webfiori - Copy}/framework/session/SessionStorage.php (100%) rename {webfiori => webfiori - Copy}/framework/session/SessionUser.php (100%) rename {webfiori => webfiori - Copy}/framework/session/SessionsManager.php (100%) rename {webfiori => webfiori - Copy}/framework/ui/BeforeRenderCallback.php (100%) rename {webfiori => webfiori - Copy}/framework/ui/HTTPCodeView.php (100%) rename {webfiori => webfiori - Copy}/framework/ui/MessageBox.php (100%) rename {webfiori => webfiori - Copy}/framework/ui/StarterPage.php (100%) rename {webfiori => webfiori - Copy}/framework/ui/WebPage.php (100%) rename {webfiori => webfiori - Copy}/framework/ui/serverErrPage/ServerErrPage.php (100%) rename {webfiori => webfiori - Copy}/framework/ui/serverErrPage/error-details.php (100%) rename {webfiori => webfiori - Copy}/framework/ui/serverErrPage/server-err-head.php (100%) rename {webfiori => webfiori - Copy}/framework/ui/serverErrPage/server-err-header.php (100%) rename {webfiori => webfiori - Copy}/framework/ui/serverErrPage/server-err-stack-trace.php (100%) rename {webfiori => webfiori - Copy}/framework/ui/ui-functions.php (100%) rename {webfiori => webfiori - Copy}/framework/writers/APITestCaseWriter.php (100%) rename {webfiori => webfiori - Copy}/framework/writers/ClassWriter.php (100%) rename {webfiori => webfiori - Copy}/framework/writers/CommandClassWriter.php (100%) rename {webfiori => webfiori - Copy}/framework/writers/DBClassWriter.php (100%) rename {webfiori => webfiori - Copy}/framework/writers/DatabaseMigrationWriter.php (100%) rename {webfiori => webfiori - Copy}/framework/writers/LangClassWriter.php (100%) rename {webfiori => webfiori - Copy}/framework/writers/MiddlewareClassWriter.php (100%) rename {webfiori => webfiori - Copy}/framework/writers/SchedulerTaskClassWriter.php (100%) rename {webfiori => webfiori - Copy}/framework/writers/ServiceHolder.php (100%) rename {webfiori => webfiori - Copy}/framework/writers/TableClassWriter.php (100%) rename {webfiori => webfiori - Copy}/framework/writers/ThemeClassWriter.php (100%) rename {webfiori => webfiori - Copy}/framework/writers/ThemeComponentWriter.php (100%) rename {webfiori => webfiori - Copy}/framework/writers/WebServiceWriter.php (100%) delete mode 100644 webfiori/db/temp diff --git a/tests/webfiori/benchmark/RouterBench.php b/tests/webfiori - Copy/benchmark/RouterBench.php similarity index 100% rename from tests/webfiori/benchmark/RouterBench.php rename to tests/webfiori - Copy/benchmark/RouterBench.php diff --git a/tests/webfiori/framework/test/AccessTest.php b/tests/webfiori - Copy/framework/test/AccessTest.php similarity index 100% rename from tests/webfiori/framework/test/AccessTest.php rename to tests/webfiori - Copy/framework/test/AccessTest.php diff --git a/tests/webfiori/framework/test/ClassUtilTest.php b/tests/webfiori - Copy/framework/test/ClassUtilTest.php similarity index 100% rename from tests/webfiori/framework/test/ClassUtilTest.php rename to tests/webfiori - Copy/framework/test/ClassUtilTest.php diff --git a/tests/webfiori/framework/test/DBTest.php b/tests/webfiori - Copy/framework/test/DBTest.php similarity index 100% rename from tests/webfiori/framework/test/DBTest.php rename to tests/webfiori - Copy/framework/test/DBTest.php diff --git a/tests/webfiori/framework/test/PageTest.php b/tests/webfiori - Copy/framework/test/PageTest.php similarity index 100% rename from tests/webfiori/framework/test/PageTest.php rename to tests/webfiori - Copy/framework/test/PageTest.php diff --git a/tests/webfiori/framework/test/PrivilegeTest.php b/tests/webfiori - Copy/framework/test/PrivilegeTest.php similarity index 100% rename from tests/webfiori/framework/test/PrivilegeTest.php rename to tests/webfiori - Copy/framework/test/PrivilegeTest.php diff --git a/tests/webfiori/framework/test/PrivilegesGroupTest.php b/tests/webfiori - Copy/framework/test/PrivilegesGroupTest.php similarity index 100% rename from tests/webfiori/framework/test/PrivilegesGroupTest.php rename to tests/webfiori - Copy/framework/test/PrivilegesGroupTest.php diff --git a/tests/webfiori/framework/test/ResponseTest.php b/tests/webfiori - Copy/framework/test/ResponseTest.php similarity index 100% rename from tests/webfiori/framework/test/ResponseTest.php rename to tests/webfiori - Copy/framework/test/ResponseTest.php diff --git a/tests/webfiori/framework/test/TestAutoLoader.php b/tests/webfiori - Copy/framework/test/TestAutoLoader.php similarity index 100% rename from tests/webfiori/framework/test/TestAutoLoader.php rename to tests/webfiori - Copy/framework/test/TestAutoLoader.php diff --git a/tests/webfiori/framework/test/UserTest.php b/tests/webfiori - Copy/framework/test/UserTest.php similarity index 100% rename from tests/webfiori/framework/test/UserTest.php rename to tests/webfiori - Copy/framework/test/UserTest.php diff --git a/tests/webfiori/framework/test/UtilTest.php b/tests/webfiori - Copy/framework/test/UtilTest.php similarity index 100% rename from tests/webfiori/framework/test/UtilTest.php rename to tests/webfiori - Copy/framework/test/UtilTest.php diff --git a/tests/webfiori/framework/test/cli/AddCommandTest.php b/tests/webfiori - Copy/framework/test/cli/AddCommandTest.php similarity index 100% rename from tests/webfiori/framework/test/cli/AddCommandTest.php rename to tests/webfiori - Copy/framework/test/cli/AddCommandTest.php diff --git a/tests/webfiori/framework/test/cli/CreateAPITestCaseTest.php b/tests/webfiori - Copy/framework/test/cli/CreateAPITestCaseTest.php similarity index 100% rename from tests/webfiori/framework/test/cli/CreateAPITestCaseTest.php rename to tests/webfiori - Copy/framework/test/cli/CreateAPITestCaseTest.php diff --git a/tests/webfiori/framework/test/cli/CreateCLICommandTest.php b/tests/webfiori - Copy/framework/test/cli/CreateCLICommandTest.php similarity index 100% rename from tests/webfiori/framework/test/cli/CreateCLICommandTest.php rename to tests/webfiori - Copy/framework/test/cli/CreateCLICommandTest.php diff --git a/tests/webfiori/framework/test/cli/CreateCommandTest.php b/tests/webfiori - Copy/framework/test/cli/CreateCommandTest.php similarity index 100% rename from tests/webfiori/framework/test/cli/CreateCommandTest.php rename to tests/webfiori - Copy/framework/test/cli/CreateCommandTest.php diff --git a/tests/webfiori/framework/test/cli/CreateDBAccessTest.php b/tests/webfiori - Copy/framework/test/cli/CreateDBAccessTest.php similarity index 100% rename from tests/webfiori/framework/test/cli/CreateDBAccessTest.php rename to tests/webfiori - Copy/framework/test/cli/CreateDBAccessTest.php diff --git a/tests/webfiori/framework/test/cli/CreateEntityTest.php b/tests/webfiori - Copy/framework/test/cli/CreateEntityTest.php similarity index 100% rename from tests/webfiori/framework/test/cli/CreateEntityTest.php rename to tests/webfiori - Copy/framework/test/cli/CreateEntityTest.php diff --git a/tests/webfiori/framework/test/cli/CreateMiddlewareTest.php b/tests/webfiori - Copy/framework/test/cli/CreateMiddlewareTest.php similarity index 100% rename from tests/webfiori/framework/test/cli/CreateMiddlewareTest.php rename to tests/webfiori - Copy/framework/test/cli/CreateMiddlewareTest.php diff --git a/tests/webfiori/framework/test/cli/CreateMigrationTest.php b/tests/webfiori - Copy/framework/test/cli/CreateMigrationTest.php similarity index 100% rename from tests/webfiori/framework/test/cli/CreateMigrationTest.php rename to tests/webfiori - Copy/framework/test/cli/CreateMigrationTest.php diff --git a/tests/webfiori/framework/test/cli/CreateRESTTest.php b/tests/webfiori - Copy/framework/test/cli/CreateRESTTest.php similarity index 100% rename from tests/webfiori/framework/test/cli/CreateRESTTest.php rename to tests/webfiori - Copy/framework/test/cli/CreateRESTTest.php diff --git a/tests/webfiori/framework/test/cli/CreateTableTest.php b/tests/webfiori - Copy/framework/test/cli/CreateTableTest.php similarity index 100% rename from tests/webfiori/framework/test/cli/CreateTableTest.php rename to tests/webfiori - Copy/framework/test/cli/CreateTableTest.php diff --git a/tests/webfiori/framework/test/cli/CreateTaskTest.php b/tests/webfiori - Copy/framework/test/cli/CreateTaskTest.php similarity index 100% rename from tests/webfiori/framework/test/cli/CreateTaskTest.php rename to tests/webfiori - Copy/framework/test/cli/CreateTaskTest.php diff --git a/tests/webfiori/framework/test/cli/CreateThemeTest.php b/tests/webfiori - Copy/framework/test/cli/CreateThemeTest.php similarity index 100% rename from tests/webfiori/framework/test/cli/CreateThemeTest.php rename to tests/webfiori - Copy/framework/test/cli/CreateThemeTest.php diff --git a/tests/webfiori/framework/test/cli/CreateWebServiceTest.php b/tests/webfiori - Copy/framework/test/cli/CreateWebServiceTest.php similarity index 100% rename from tests/webfiori/framework/test/cli/CreateWebServiceTest.php rename to tests/webfiori - Copy/framework/test/cli/CreateWebServiceTest.php diff --git a/tests/webfiori/framework/test/cli/DBClassWritterTest.php b/tests/webfiori - Copy/framework/test/cli/DBClassWritterTest.php similarity index 100% rename from tests/webfiori/framework/test/cli/DBClassWritterTest.php rename to tests/webfiori - Copy/framework/test/cli/DBClassWritterTest.php diff --git a/tests/webfiori/framework/test/cli/HelpCommandTest.php b/tests/webfiori - Copy/framework/test/cli/HelpCommandTest.php similarity index 100% rename from tests/webfiori/framework/test/cli/HelpCommandTest.php rename to tests/webfiori - Copy/framework/test/cli/HelpCommandTest.php diff --git a/tests/webfiori/framework/test/cli/ListRoutesCommandTest.php b/tests/webfiori - Copy/framework/test/cli/ListRoutesCommandTest.php similarity index 100% rename from tests/webfiori/framework/test/cli/ListRoutesCommandTest.php rename to tests/webfiori - Copy/framework/test/cli/ListRoutesCommandTest.php diff --git a/tests/webfiori/framework/test/cli/ListThemesCommandTest.php b/tests/webfiori - Copy/framework/test/cli/ListThemesCommandTest.php similarity index 100% rename from tests/webfiori/framework/test/cli/ListThemesCommandTest.php rename to tests/webfiori - Copy/framework/test/cli/ListThemesCommandTest.php diff --git a/tests/webfiori/framework/test/cli/RunMigrationsCommandTest.php b/tests/webfiori - Copy/framework/test/cli/RunMigrationsCommandTest.php similarity index 100% rename from tests/webfiori/framework/test/cli/RunMigrationsCommandTest.php rename to tests/webfiori - Copy/framework/test/cli/RunMigrationsCommandTest.php diff --git a/tests/webfiori/framework/test/cli/RunSQLCommandTest.php b/tests/webfiori - Copy/framework/test/cli/RunSQLCommandTest.php similarity index 100% rename from tests/webfiori/framework/test/cli/RunSQLCommandTest.php rename to tests/webfiori - Copy/framework/test/cli/RunSQLCommandTest.php diff --git a/tests/webfiori/framework/test/cli/SchedulerCommandTest.php b/tests/webfiori - Copy/framework/test/cli/SchedulerCommandTest.php similarity index 100% rename from tests/webfiori/framework/test/cli/SchedulerCommandTest.php rename to tests/webfiori - Copy/framework/test/cli/SchedulerCommandTest.php diff --git a/tests/webfiori/framework/test/cli/SettingsCommandTest.php b/tests/webfiori - Copy/framework/test/cli/SettingsCommandTest.php similarity index 100% rename from tests/webfiori/framework/test/cli/SettingsCommandTest.php rename to tests/webfiori - Copy/framework/test/cli/SettingsCommandTest.php diff --git a/tests/webfiori/framework/test/cli/UpdateSettingsCommandTest.php b/tests/webfiori - Copy/framework/test/cli/UpdateSettingsCommandTest.php similarity index 100% rename from tests/webfiori/framework/test/cli/UpdateSettingsCommandTest.php rename to tests/webfiori - Copy/framework/test/cli/UpdateSettingsCommandTest.php diff --git a/tests/webfiori/framework/test/cli/UpdateTableCommandTest.php b/tests/webfiori - Copy/framework/test/cli/UpdateTableCommandTest.php similarity index 100% rename from tests/webfiori/framework/test/cli/UpdateTableCommandTest.php rename to tests/webfiori - Copy/framework/test/cli/UpdateTableCommandTest.php diff --git a/tests/webfiori/framework/test/cli/VersionCommandTest.php b/tests/webfiori - Copy/framework/test/cli/VersionCommandTest.php similarity index 100% rename from tests/webfiori/framework/test/cli/VersionCommandTest.php rename to tests/webfiori - Copy/framework/test/cli/VersionCommandTest.php diff --git a/tests/webfiori/framework/test/config/JsonDriverTest.php b/tests/webfiori - Copy/framework/test/config/JsonDriverTest.php similarity index 100% rename from tests/webfiori/framework/test/config/JsonDriverTest.php rename to tests/webfiori - Copy/framework/test/config/JsonDriverTest.php diff --git a/tests/webfiori/framework/test/langs/LanguageTest.php b/tests/webfiori - Copy/framework/test/langs/LanguageTest.php similarity index 100% rename from tests/webfiori/framework/test/langs/LanguageTest.php rename to tests/webfiori - Copy/framework/test/langs/LanguageTest.php diff --git a/tests/webfiori/framework/test/mail/EmailMessageTest.php b/tests/webfiori - Copy/framework/test/mail/EmailMessageTest.php similarity index 100% rename from tests/webfiori/framework/test/mail/EmailMessageTest.php rename to tests/webfiori - Copy/framework/test/mail/EmailMessageTest.php diff --git a/tests/webfiori/framework/test/router/RouterTest.php b/tests/webfiori - Copy/framework/test/router/RouterTest.php similarity index 100% rename from tests/webfiori/framework/test/router/RouterTest.php rename to tests/webfiori - Copy/framework/test/router/RouterTest.php diff --git a/tests/webfiori/framework/test/router/RouterUriTest.php b/tests/webfiori - Copy/framework/test/router/RouterUriTest.php similarity index 100% rename from tests/webfiori/framework/test/router/RouterUriTest.php rename to tests/webfiori - Copy/framework/test/router/RouterUriTest.php diff --git a/tests/webfiori/framework/test/scheduler/JobArgumentTest.php b/tests/webfiori - Copy/framework/test/scheduler/JobArgumentTest.php similarity index 100% rename from tests/webfiori/framework/test/scheduler/JobArgumentTest.php rename to tests/webfiori - Copy/framework/test/scheduler/JobArgumentTest.php diff --git a/tests/webfiori/framework/test/scheduler/SchedulerTaskTest.php b/tests/webfiori - Copy/framework/test/scheduler/SchedulerTaskTest.php similarity index 100% rename from tests/webfiori/framework/test/scheduler/SchedulerTaskTest.php rename to tests/webfiori - Copy/framework/test/scheduler/SchedulerTaskTest.php diff --git a/tests/webfiori/framework/test/scheduler/SchedulerTest.php b/tests/webfiori - Copy/framework/test/scheduler/SchedulerTest.php similarity index 100% rename from tests/webfiori/framework/test/scheduler/SchedulerTest.php rename to tests/webfiori - Copy/framework/test/scheduler/SchedulerTest.php diff --git a/tests/webfiori/framework/test/session/SessionTest.php b/tests/webfiori - Copy/framework/test/session/SessionTest.php similarity index 100% rename from tests/webfiori/framework/test/session/SessionTest.php rename to tests/webfiori - Copy/framework/test/session/SessionTest.php diff --git a/tests/webfiori/framework/test/session/SessionsManagerTest.php b/tests/webfiori - Copy/framework/test/session/SessionsManagerTest.php similarity index 100% rename from tests/webfiori/framework/test/session/SessionsManagerTest.php rename to tests/webfiori - Copy/framework/test/session/SessionsManagerTest.php diff --git a/tests/webfiori/framework/test/theme/ThemeTest.php b/tests/webfiori - Copy/framework/test/theme/ThemeTest.php similarity index 100% rename from tests/webfiori/framework/test/theme/ThemeTest.php rename to tests/webfiori - Copy/framework/test/theme/ThemeTest.php diff --git a/tests/webfiori/framework/test/writers/BackgroundTaskWritterTest.php b/tests/webfiori - Copy/framework/test/writers/BackgroundTaskWritterTest.php similarity index 100% rename from tests/webfiori/framework/test/writers/BackgroundTaskWritterTest.php rename to tests/webfiori - Copy/framework/test/writers/BackgroundTaskWritterTest.php diff --git a/tests/webfiori/framework/test/writers/CLICommandClassWriterTest.php b/tests/webfiori - Copy/framework/test/writers/CLICommandClassWriterTest.php similarity index 100% rename from tests/webfiori/framework/test/writers/CLICommandClassWriterTest.php rename to tests/webfiori - Copy/framework/test/writers/CLICommandClassWriterTest.php diff --git a/tests/webfiori/framework/test/writers/DatabaseMigrationWriterTest.php b/tests/webfiori - Copy/framework/test/writers/DatabaseMigrationWriterTest.php similarity index 100% rename from tests/webfiori/framework/test/writers/DatabaseMigrationWriterTest.php rename to tests/webfiori - Copy/framework/test/writers/DatabaseMigrationWriterTest.php diff --git a/tests/webfiori/framework/test/writers/LangWritterTest.php b/tests/webfiori - Copy/framework/test/writers/LangWritterTest.php similarity index 100% rename from tests/webfiori/framework/test/writers/LangWritterTest.php rename to tests/webfiori - Copy/framework/test/writers/LangWritterTest.php diff --git a/tests/webfiori/framework/test/writers/MiddlewareWritterTest.php b/tests/webfiori - Copy/framework/test/writers/MiddlewareWritterTest.php similarity index 100% rename from tests/webfiori/framework/test/writers/MiddlewareWritterTest.php rename to tests/webfiori - Copy/framework/test/writers/MiddlewareWritterTest.php diff --git a/tests/webfiori/framework/test/writers/TableWritterTest.php b/tests/webfiori - Copy/framework/test/writers/TableWritterTest.php similarity index 100% rename from tests/webfiori/framework/test/writers/TableWritterTest.php rename to tests/webfiori - Copy/framework/test/writers/TableWritterTest.php diff --git a/tests/webfiori/framework/test/writers/ThemeWritterTest.php b/tests/webfiori - Copy/framework/test/writers/ThemeWritterTest.php similarity index 100% rename from tests/webfiori/framework/test/writers/ThemeWritterTest.php rename to tests/webfiori - Copy/framework/test/writers/ThemeWritterTest.php diff --git a/tests/webfiori/framework/test/writers/WebServiceTestCaseWriterTest.php b/tests/webfiori - Copy/framework/test/writers/WebServiceTestCaseWriterTest.php similarity index 100% rename from tests/webfiori/framework/test/writers/WebServiceTestCaseWriterTest.php rename to tests/webfiori - Copy/framework/test/writers/WebServiceTestCaseWriterTest.php diff --git a/tests/webfiori/framework/test/writers/WebServiceWritterTest.php b/tests/webfiori - Copy/framework/test/writers/WebServiceWritterTest.php similarity index 100% rename from tests/webfiori/framework/test/writers/WebServiceWritterTest.php rename to tests/webfiori - Copy/framework/test/writers/WebServiceWritterTest.php diff --git a/tests/webfiori/framework/scheduler/webServices/temp b/tests/webfiori/framework/scheduler/webServices/temp deleted file mode 100644 index 8b1378917..000000000 --- a/tests/webfiori/framework/scheduler/webServices/temp +++ /dev/null @@ -1 +0,0 @@ - diff --git a/webfiori/framework/Access.php b/webfiori - Copy/framework/Access.php similarity index 100% rename from webfiori/framework/Access.php rename to webfiori - Copy/framework/Access.php diff --git a/webfiori/framework/App.php b/webfiori - Copy/framework/App.php similarity index 100% rename from webfiori/framework/App.php rename to webfiori - Copy/framework/App.php diff --git a/webfiori/framework/DB.php b/webfiori - Copy/framework/DB.php similarity index 100% rename from webfiori/framework/DB.php rename to webfiori - Copy/framework/DB.php diff --git a/webfiori/framework/EmailMessage.php b/webfiori - Copy/framework/EmailMessage.php similarity index 100% rename from webfiori/framework/EmailMessage.php rename to webfiori - Copy/framework/EmailMessage.php diff --git a/webfiori/framework/ExtendedWebServicesManager.php b/webfiori - Copy/framework/ExtendedWebServicesManager.php similarity index 100% rename from webfiori/framework/ExtendedWebServicesManager.php rename to webfiori - Copy/framework/ExtendedWebServicesManager.php diff --git a/webfiori/framework/Ini.php b/webfiori - Copy/framework/Ini.php similarity index 100% rename from webfiori/framework/Ini.php rename to webfiori - Copy/framework/Ini.php diff --git a/webfiori/framework/Lang.php b/webfiori - Copy/framework/Lang.php similarity index 100% rename from webfiori/framework/Lang.php rename to webfiori - Copy/framework/Lang.php diff --git a/webfiori/framework/Privilege.php b/webfiori - Copy/framework/Privilege.php similarity index 100% rename from webfiori/framework/Privilege.php rename to webfiori - Copy/framework/Privilege.php diff --git a/webfiori/framework/PrivilegesGroup.php b/webfiori - Copy/framework/PrivilegesGroup.php similarity index 100% rename from webfiori/framework/PrivilegesGroup.php rename to webfiori - Copy/framework/PrivilegesGroup.php diff --git a/webfiori/framework/Theme.php b/webfiori - Copy/framework/Theme.php similarity index 100% rename from webfiori/framework/Theme.php rename to webfiori - Copy/framework/Theme.php diff --git a/webfiori/framework/ThemeManager.php b/webfiori - Copy/framework/ThemeManager.php similarity index 100% rename from webfiori/framework/ThemeManager.php rename to webfiori - Copy/framework/ThemeManager.php diff --git a/webfiori/framework/User.php b/webfiori - Copy/framework/User.php similarity index 100% rename from webfiori/framework/User.php rename to webfiori - Copy/framework/User.php diff --git a/webfiori/framework/Util.php b/webfiori - Copy/framework/Util.php similarity index 100% rename from webfiori/framework/Util.php rename to webfiori - Copy/framework/Util.php diff --git a/webfiori/framework/autoload/ClassInfo.php b/webfiori - Copy/framework/autoload/ClassInfo.php similarity index 100% rename from webfiori/framework/autoload/ClassInfo.php rename to webfiori - Copy/framework/autoload/ClassInfo.php diff --git a/webfiori/framework/autoload/ClassLoader.php b/webfiori - Copy/framework/autoload/ClassLoader.php similarity index 100% rename from webfiori/framework/autoload/ClassLoader.php rename to webfiori - Copy/framework/autoload/ClassLoader.php diff --git a/webfiori/framework/autoload/ClassLoaderException.php b/webfiori - Copy/framework/autoload/ClassLoaderException.php similarity index 100% rename from webfiori/framework/autoload/ClassLoaderException.php rename to webfiori - Copy/framework/autoload/ClassLoaderException.php diff --git a/webfiori/framework/cli/CLITestCase.php b/webfiori - Copy/framework/cli/CLITestCase.php similarity index 100% rename from webfiori/framework/cli/CLITestCase.php rename to webfiori - Copy/framework/cli/CLITestCase.php diff --git a/webfiori/framework/cli/CLIUtils.php b/webfiori - Copy/framework/cli/CLIUtils.php similarity index 100% rename from webfiori/framework/cli/CLIUtils.php rename to webfiori - Copy/framework/cli/CLIUtils.php diff --git a/webfiori/framework/cli/commands/AddCommand.php b/webfiori - Copy/framework/cli/commands/AddCommand.php similarity index 100% rename from webfiori/framework/cli/commands/AddCommand.php rename to webfiori - Copy/framework/cli/commands/AddCommand.php diff --git a/webfiori/framework/cli/commands/CreateCommand.php b/webfiori - Copy/framework/cli/commands/CreateCommand.php similarity index 100% rename from webfiori/framework/cli/commands/CreateCommand.php rename to webfiori - Copy/framework/cli/commands/CreateCommand.php diff --git a/webfiori/framework/cli/commands/ListRoutesCommand.php b/webfiori - Copy/framework/cli/commands/ListRoutesCommand.php similarity index 100% rename from webfiori/framework/cli/commands/ListRoutesCommand.php rename to webfiori - Copy/framework/cli/commands/ListRoutesCommand.php diff --git a/webfiori/framework/cli/commands/ListThemesCommand.php b/webfiori - Copy/framework/cli/commands/ListThemesCommand.php similarity index 100% rename from webfiori/framework/cli/commands/ListThemesCommand.php rename to webfiori - Copy/framework/cli/commands/ListThemesCommand.php diff --git a/webfiori/framework/cli/commands/RunMigrationsCommand.php b/webfiori - Copy/framework/cli/commands/RunMigrationsCommand.php similarity index 100% rename from webfiori/framework/cli/commands/RunMigrationsCommand.php rename to webfiori - Copy/framework/cli/commands/RunMigrationsCommand.php diff --git a/webfiori/framework/cli/commands/RunSQLQueryCommand.php b/webfiori - Copy/framework/cli/commands/RunSQLQueryCommand.php similarity index 100% rename from webfiori/framework/cli/commands/RunSQLQueryCommand.php rename to webfiori - Copy/framework/cli/commands/RunSQLQueryCommand.php diff --git a/webfiori/framework/cli/commands/SchedulerCommand.php b/webfiori - Copy/framework/cli/commands/SchedulerCommand.php similarity index 100% rename from webfiori/framework/cli/commands/SchedulerCommand.php rename to webfiori - Copy/framework/cli/commands/SchedulerCommand.php diff --git a/webfiori/framework/cli/commands/SettingsCommand.php b/webfiori - Copy/framework/cli/commands/SettingsCommand.php similarity index 100% rename from webfiori/framework/cli/commands/SettingsCommand.php rename to webfiori - Copy/framework/cli/commands/SettingsCommand.php diff --git a/webfiori/framework/cli/commands/UpdateSettingsCommand.php b/webfiori - Copy/framework/cli/commands/UpdateSettingsCommand.php similarity index 100% rename from webfiori/framework/cli/commands/UpdateSettingsCommand.php rename to webfiori - Copy/framework/cli/commands/UpdateSettingsCommand.php diff --git a/webfiori/framework/cli/commands/UpdateTableCommand.php b/webfiori - Copy/framework/cli/commands/UpdateTableCommand.php similarity index 100% rename from webfiori/framework/cli/commands/UpdateTableCommand.php rename to webfiori - Copy/framework/cli/commands/UpdateTableCommand.php diff --git a/webfiori/framework/cli/commands/VersionCommand.php b/webfiori - Copy/framework/cli/commands/VersionCommand.php similarity index 100% rename from webfiori/framework/cli/commands/VersionCommand.php rename to webfiori - Copy/framework/cli/commands/VersionCommand.php diff --git a/webfiori/framework/cli/commands/WHelpCommand.php b/webfiori - Copy/framework/cli/commands/WHelpCommand.php similarity index 100% rename from webfiori/framework/cli/commands/WHelpCommand.php rename to webfiori - Copy/framework/cli/commands/WHelpCommand.php diff --git a/webfiori/framework/cli/helpers/ClassInfoReader.php b/webfiori - Copy/framework/cli/helpers/ClassInfoReader.php similarity index 100% rename from webfiori/framework/cli/helpers/ClassInfoReader.php rename to webfiori - Copy/framework/cli/helpers/ClassInfoReader.php diff --git a/webfiori/framework/cli/helpers/CreateAPITestCase.php b/webfiori - Copy/framework/cli/helpers/CreateAPITestCase.php similarity index 100% rename from webfiori/framework/cli/helpers/CreateAPITestCase.php rename to webfiori - Copy/framework/cli/helpers/CreateAPITestCase.php diff --git a/webfiori/framework/cli/helpers/CreateBackgroundTask.php b/webfiori - Copy/framework/cli/helpers/CreateBackgroundTask.php similarity index 100% rename from webfiori/framework/cli/helpers/CreateBackgroundTask.php rename to webfiori - Copy/framework/cli/helpers/CreateBackgroundTask.php diff --git a/webfiori/framework/cli/helpers/CreateCLIClassHelper.php b/webfiori - Copy/framework/cli/helpers/CreateCLIClassHelper.php similarity index 100% rename from webfiori/framework/cli/helpers/CreateCLIClassHelper.php rename to webfiori - Copy/framework/cli/helpers/CreateCLIClassHelper.php diff --git a/webfiori/framework/cli/helpers/CreateClassHelper.php b/webfiori - Copy/framework/cli/helpers/CreateClassHelper.php similarity index 100% rename from webfiori/framework/cli/helpers/CreateClassHelper.php rename to webfiori - Copy/framework/cli/helpers/CreateClassHelper.php diff --git a/webfiori/framework/cli/helpers/CreateDBAccessHelper.php b/webfiori - Copy/framework/cli/helpers/CreateDBAccessHelper.php similarity index 100% rename from webfiori/framework/cli/helpers/CreateDBAccessHelper.php rename to webfiori - Copy/framework/cli/helpers/CreateDBAccessHelper.php diff --git a/webfiori/framework/cli/helpers/CreateFullRESTHelper.php b/webfiori - Copy/framework/cli/helpers/CreateFullRESTHelper.php similarity index 100% rename from webfiori/framework/cli/helpers/CreateFullRESTHelper.php rename to webfiori - Copy/framework/cli/helpers/CreateFullRESTHelper.php diff --git a/webfiori/framework/cli/helpers/CreateMiddleware.php b/webfiori - Copy/framework/cli/helpers/CreateMiddleware.php similarity index 100% rename from webfiori/framework/cli/helpers/CreateMiddleware.php rename to webfiori - Copy/framework/cli/helpers/CreateMiddleware.php diff --git a/webfiori/framework/cli/helpers/CreateMigration.php b/webfiori - Copy/framework/cli/helpers/CreateMigration.php similarity index 100% rename from webfiori/framework/cli/helpers/CreateMigration.php rename to webfiori - Copy/framework/cli/helpers/CreateMigration.php diff --git a/webfiori/framework/cli/helpers/CreateTableObj.php b/webfiori - Copy/framework/cli/helpers/CreateTableObj.php similarity index 100% rename from webfiori/framework/cli/helpers/CreateTableObj.php rename to webfiori - Copy/framework/cli/helpers/CreateTableObj.php diff --git a/webfiori/framework/cli/helpers/CreateThemeHelper.php b/webfiori - Copy/framework/cli/helpers/CreateThemeHelper.php similarity index 100% rename from webfiori/framework/cli/helpers/CreateThemeHelper.php rename to webfiori - Copy/framework/cli/helpers/CreateThemeHelper.php diff --git a/webfiori/framework/cli/helpers/CreateWebService.php b/webfiori - Copy/framework/cli/helpers/CreateWebService.php similarity index 100% rename from webfiori/framework/cli/helpers/CreateWebService.php rename to webfiori - Copy/framework/cli/helpers/CreateWebService.php diff --git a/webfiori/framework/cli/helpers/TableObjHelper.php b/webfiori - Copy/framework/cli/helpers/TableObjHelper.php similarity index 100% rename from webfiori/framework/cli/helpers/TableObjHelper.php rename to webfiori - Copy/framework/cli/helpers/TableObjHelper.php diff --git a/webfiori/framework/config/ClassDriver.php b/webfiori - Copy/framework/config/ClassDriver.php similarity index 100% rename from webfiori/framework/config/ClassDriver.php rename to webfiori - Copy/framework/config/ClassDriver.php diff --git a/webfiori/framework/config/ConfigurationDriver.php b/webfiori - Copy/framework/config/ConfigurationDriver.php similarity index 100% rename from webfiori/framework/config/ConfigurationDriver.php rename to webfiori - Copy/framework/config/ConfigurationDriver.php diff --git a/webfiori/framework/config/Controller.php b/webfiori - Copy/framework/config/Controller.php similarity index 100% rename from webfiori/framework/config/Controller.php rename to webfiori - Copy/framework/config/Controller.php diff --git a/webfiori/framework/config/JsonDriver.php b/webfiori - Copy/framework/config/JsonDriver.php similarity index 100% rename from webfiori/framework/config/JsonDriver.php rename to webfiori - Copy/framework/config/JsonDriver.php diff --git a/webfiori/framework/exceptions/ArrayIndexOutOfBoundsException.php b/webfiori - Copy/framework/exceptions/ArrayIndexOutOfBoundsException.php similarity index 100% rename from webfiori/framework/exceptions/ArrayIndexOutOfBoundsException.php rename to webfiori - Copy/framework/exceptions/ArrayIndexOutOfBoundsException.php diff --git a/webfiori/framework/exceptions/InitializationException.php b/webfiori - Copy/framework/exceptions/InitializationException.php similarity index 100% rename from webfiori/framework/exceptions/InitializationException.php rename to webfiori - Copy/framework/exceptions/InitializationException.php diff --git a/webfiori/framework/exceptions/InvalidCRONExprException.php b/webfiori - Copy/framework/exceptions/InvalidCRONExprException.php similarity index 100% rename from webfiori/framework/exceptions/InvalidCRONExprException.php rename to webfiori - Copy/framework/exceptions/InvalidCRONExprException.php diff --git a/webfiori/framework/exceptions/MissingLangException.php b/webfiori - Copy/framework/exceptions/MissingLangException.php similarity index 100% rename from webfiori/framework/exceptions/MissingLangException.php rename to webfiori - Copy/framework/exceptions/MissingLangException.php diff --git a/webfiori/framework/exceptions/NoSuchThemeException.php b/webfiori - Copy/framework/exceptions/NoSuchThemeException.php similarity index 100% rename from webfiori/framework/exceptions/NoSuchThemeException.php rename to webfiori - Copy/framework/exceptions/NoSuchThemeException.php diff --git a/webfiori/framework/exceptions/RoutingException.php b/webfiori - Copy/framework/exceptions/RoutingException.php similarity index 100% rename from webfiori/framework/exceptions/RoutingException.php rename to webfiori - Copy/framework/exceptions/RoutingException.php diff --git a/webfiori/framework/exceptions/SessionException.php b/webfiori - Copy/framework/exceptions/SessionException.php similarity index 100% rename from webfiori/framework/exceptions/SessionException.php rename to webfiori - Copy/framework/exceptions/SessionException.php diff --git a/webfiori/framework/exceptions/UIException.php b/webfiori - Copy/framework/exceptions/UIException.php similarity index 100% rename from webfiori/framework/exceptions/UIException.php rename to webfiori - Copy/framework/exceptions/UIException.php diff --git a/webfiori/framework/handlers/APICallErrHandler.php b/webfiori - Copy/framework/handlers/APICallErrHandler.php similarity index 100% rename from webfiori/framework/handlers/APICallErrHandler.php rename to webfiori - Copy/framework/handlers/APICallErrHandler.php diff --git a/webfiori/framework/handlers/CLIErrHandler.php b/webfiori - Copy/framework/handlers/CLIErrHandler.php similarity index 100% rename from webfiori/framework/handlers/CLIErrHandler.php rename to webfiori - Copy/framework/handlers/CLIErrHandler.php diff --git a/webfiori/framework/handlers/HTTPErrHandler.php b/webfiori - Copy/framework/handlers/HTTPErrHandler.php similarity index 100% rename from webfiori/framework/handlers/HTTPErrHandler.php rename to webfiori - Copy/framework/handlers/HTTPErrHandler.php diff --git a/webfiori/framework/middleware/AbstractMiddleware.php b/webfiori - Copy/framework/middleware/AbstractMiddleware.php similarity index 100% rename from webfiori/framework/middleware/AbstractMiddleware.php rename to webfiori - Copy/framework/middleware/AbstractMiddleware.php diff --git a/webfiori/framework/middleware/CacheMiddleware.php b/webfiori - Copy/framework/middleware/CacheMiddleware.php similarity index 100% rename from webfiori/framework/middleware/CacheMiddleware.php rename to webfiori - Copy/framework/middleware/CacheMiddleware.php diff --git a/webfiori/framework/middleware/MiddlewareManager.php b/webfiori - Copy/framework/middleware/MiddlewareManager.php similarity index 100% rename from webfiori/framework/middleware/MiddlewareManager.php rename to webfiori - Copy/framework/middleware/MiddlewareManager.php diff --git a/webfiori/framework/middleware/StartSessionMiddleware.php b/webfiori - Copy/framework/middleware/StartSessionMiddleware.php similarity index 100% rename from webfiori/framework/middleware/StartSessionMiddleware.php rename to webfiori - Copy/framework/middleware/StartSessionMiddleware.php diff --git a/webfiori/framework/router/RouteOption.php b/webfiori - Copy/framework/router/RouteOption.php similarity index 100% rename from webfiori/framework/router/RouteOption.php rename to webfiori - Copy/framework/router/RouteOption.php diff --git a/webfiori/framework/router/Router.php b/webfiori - Copy/framework/router/Router.php similarity index 100% rename from webfiori/framework/router/Router.php rename to webfiori - Copy/framework/router/Router.php diff --git a/webfiori/framework/router/RouterUri.php b/webfiori - Copy/framework/router/RouterUri.php similarity index 100% rename from webfiori/framework/router/RouterUri.php rename to webfiori - Copy/framework/router/RouterUri.php diff --git a/webfiori/framework/scheduler/AbstractTask.php b/webfiori - Copy/framework/scheduler/AbstractTask.php similarity index 100% rename from webfiori/framework/scheduler/AbstractTask.php rename to webfiori - Copy/framework/scheduler/AbstractTask.php diff --git a/webfiori/framework/scheduler/BaseTask.php b/webfiori - Copy/framework/scheduler/BaseTask.php similarity index 100% rename from webfiori/framework/scheduler/BaseTask.php rename to webfiori - Copy/framework/scheduler/BaseTask.php diff --git a/webfiori/framework/scheduler/TaskArgument.php b/webfiori - Copy/framework/scheduler/TaskArgument.php similarity index 100% rename from webfiori/framework/scheduler/TaskArgument.php rename to webfiori - Copy/framework/scheduler/TaskArgument.php diff --git a/webfiori/framework/scheduler/TaskStatusEmail.php b/webfiori - Copy/framework/scheduler/TaskStatusEmail.php similarity index 100% rename from webfiori/framework/scheduler/TaskStatusEmail.php rename to webfiori - Copy/framework/scheduler/TaskStatusEmail.php diff --git a/webfiori/framework/scheduler/TasksManager.php b/webfiori - Copy/framework/scheduler/TasksManager.php similarity index 100% rename from webfiori/framework/scheduler/TasksManager.php rename to webfiori - Copy/framework/scheduler/TasksManager.php diff --git a/webfiori/framework/scheduler/webServices/ForceTaskExecutionService.php b/webfiori - Copy/framework/scheduler/webServices/ForceTaskExecutionService.php similarity index 100% rename from webfiori/framework/scheduler/webServices/ForceTaskExecutionService.php rename to webfiori - Copy/framework/scheduler/webServices/ForceTaskExecutionService.php diff --git a/webfiori/framework/scheduler/webServices/GetTasksService.php b/webfiori - Copy/framework/scheduler/webServices/GetTasksService.php similarity index 100% rename from webfiori/framework/scheduler/webServices/GetTasksService.php rename to webfiori - Copy/framework/scheduler/webServices/GetTasksService.php diff --git a/webfiori/framework/scheduler/webServices/PrivateSchedulerService.php b/webfiori - Copy/framework/scheduler/webServices/PrivateSchedulerService.php similarity index 100% rename from webfiori/framework/scheduler/webServices/PrivateSchedulerService.php rename to webfiori - Copy/framework/scheduler/webServices/PrivateSchedulerService.php diff --git a/webfiori/framework/scheduler/webServices/SetupPasswordService.php b/webfiori - Copy/framework/scheduler/webServices/SetupPasswordService.php similarity index 100% rename from webfiori/framework/scheduler/webServices/SetupPasswordService.php rename to webfiori - Copy/framework/scheduler/webServices/SetupPasswordService.php diff --git a/webfiori/framework/scheduler/webServices/TasksLoginService.php b/webfiori - Copy/framework/scheduler/webServices/TasksLoginService.php similarity index 100% rename from webfiori/framework/scheduler/webServices/TasksLoginService.php rename to webfiori - Copy/framework/scheduler/webServices/TasksLoginService.php diff --git a/webfiori/framework/scheduler/webServices/TasksLogoutService.php b/webfiori - Copy/framework/scheduler/webServices/TasksLogoutService.php similarity index 100% rename from webfiori/framework/scheduler/webServices/TasksLogoutService.php rename to webfiori - Copy/framework/scheduler/webServices/TasksLogoutService.php diff --git a/webfiori/framework/scheduler/webServices/TasksServicesManager.php b/webfiori - Copy/framework/scheduler/webServices/TasksServicesManager.php similarity index 100% rename from webfiori/framework/scheduler/webServices/TasksServicesManager.php rename to webfiori - Copy/framework/scheduler/webServices/TasksServicesManager.php diff --git a/webfiori/framework/scheduler/webUI/BaseTasksPage.php b/webfiori - Copy/framework/scheduler/webUI/BaseTasksPage.php similarity index 100% rename from webfiori/framework/scheduler/webUI/BaseTasksPage.php rename to webfiori - Copy/framework/scheduler/webUI/BaseTasksPage.php diff --git a/webfiori/framework/scheduler/webUI/ListTasksPage.php b/webfiori - Copy/framework/scheduler/webUI/ListTasksPage.php similarity index 100% rename from webfiori/framework/scheduler/webUI/ListTasksPage.php rename to webfiori - Copy/framework/scheduler/webUI/ListTasksPage.php diff --git a/webfiori/framework/scheduler/webUI/SetPasswordPage.php b/webfiori - Copy/framework/scheduler/webUI/SetPasswordPage.php similarity index 100% rename from webfiori/framework/scheduler/webUI/SetPasswordPage.php rename to webfiori - Copy/framework/scheduler/webUI/SetPasswordPage.php diff --git a/webfiori/framework/scheduler/webUI/TasksLoginPage.php b/webfiori - Copy/framework/scheduler/webUI/TasksLoginPage.php similarity index 100% rename from webfiori/framework/scheduler/webUI/TasksLoginPage.php rename to webfiori - Copy/framework/scheduler/webUI/TasksLoginPage.php diff --git a/webfiori/framework/scheduler/webUI/TasksTable.php b/webfiori - Copy/framework/scheduler/webUI/TasksTable.php similarity index 100% rename from webfiori/framework/scheduler/webUI/TasksTable.php rename to webfiori - Copy/framework/scheduler/webUI/TasksTable.php diff --git a/webfiori/framework/scheduler/webUI/templates/job-execution-status-dialog.html b/webfiori - Copy/framework/scheduler/webUI/templates/job-execution-status-dialog.html similarity index 100% rename from webfiori/framework/scheduler/webUI/templates/job-execution-status-dialog.html rename to webfiori - Copy/framework/scheduler/webUI/templates/job-execution-status-dialog.html diff --git a/webfiori/framework/scheduler/webUI/templates/job-output-dialog.html b/webfiori - Copy/framework/scheduler/webUI/templates/job-output-dialog.html similarity index 100% rename from webfiori/framework/scheduler/webUI/templates/job-output-dialog.html rename to webfiori - Copy/framework/scheduler/webUI/templates/job-output-dialog.html diff --git a/webfiori/framework/scheduler/webUI/templates/login-form.html b/webfiori - Copy/framework/scheduler/webUI/templates/login-form.html similarity index 100% rename from webfiori/framework/scheduler/webUI/templates/login-form.html rename to webfiori - Copy/framework/scheduler/webUI/templates/login-form.html diff --git a/webfiori/framework/scheduler/webUI/templates/message-dialog.html b/webfiori - Copy/framework/scheduler/webUI/templates/message-dialog.html similarity index 100% rename from webfiori/framework/scheduler/webUI/templates/message-dialog.html rename to webfiori - Copy/framework/scheduler/webUI/templates/message-dialog.html diff --git a/webfiori/framework/scheduler/webUI/templates/scheduler-head.php b/webfiori - Copy/framework/scheduler/webUI/templates/scheduler-head.php similarity index 100% rename from webfiori/framework/scheduler/webUI/templates/scheduler-head.php rename to webfiori - Copy/framework/scheduler/webUI/templates/scheduler-head.php diff --git a/webfiori/framework/scheduler/webUI/templates/set-password-form.html b/webfiori - Copy/framework/scheduler/webUI/templates/set-password-form.html similarity index 100% rename from webfiori/framework/scheduler/webUI/templates/set-password-form.html rename to webfiori - Copy/framework/scheduler/webUI/templates/set-password-form.html diff --git a/webfiori/framework/scheduler/webUI/templates/tasks-table.html b/webfiori - Copy/framework/scheduler/webUI/templates/tasks-table.html similarity index 100% rename from webfiori/framework/scheduler/webUI/templates/tasks-table.html rename to webfiori - Copy/framework/scheduler/webUI/templates/tasks-table.html diff --git a/webfiori/framework/session/DatabaseSessionStorage.php b/webfiori - Copy/framework/session/DatabaseSessionStorage.php similarity index 100% rename from webfiori/framework/session/DatabaseSessionStorage.php rename to webfiori - Copy/framework/session/DatabaseSessionStorage.php diff --git a/webfiori/framework/session/DefaultSessionStorage.php b/webfiori - Copy/framework/session/DefaultSessionStorage.php similarity index 100% rename from webfiori/framework/session/DefaultSessionStorage.php rename to webfiori - Copy/framework/session/DefaultSessionStorage.php diff --git a/webfiori/framework/session/MSSQLSessionDataTable.php b/webfiori - Copy/framework/session/MSSQLSessionDataTable.php similarity index 100% rename from webfiori/framework/session/MSSQLSessionDataTable.php rename to webfiori - Copy/framework/session/MSSQLSessionDataTable.php diff --git a/webfiori/framework/session/MSSQLSessionsTable.php b/webfiori - Copy/framework/session/MSSQLSessionsTable.php similarity index 100% rename from webfiori/framework/session/MSSQLSessionsTable.php rename to webfiori - Copy/framework/session/MSSQLSessionsTable.php diff --git a/webfiori/framework/session/MySQLSessionDataTable.php b/webfiori - Copy/framework/session/MySQLSessionDataTable.php similarity index 100% rename from webfiori/framework/session/MySQLSessionDataTable.php rename to webfiori - Copy/framework/session/MySQLSessionDataTable.php diff --git a/webfiori/framework/session/MySQLSessionsTable.php b/webfiori - Copy/framework/session/MySQLSessionsTable.php similarity index 100% rename from webfiori/framework/session/MySQLSessionsTable.php rename to webfiori - Copy/framework/session/MySQLSessionsTable.php diff --git a/webfiori/framework/session/Session.php b/webfiori - Copy/framework/session/Session.php similarity index 100% rename from webfiori/framework/session/Session.php rename to webfiori - Copy/framework/session/Session.php diff --git a/webfiori/framework/session/SessionDB.php b/webfiori - Copy/framework/session/SessionDB.php similarity index 100% rename from webfiori/framework/session/SessionDB.php rename to webfiori - Copy/framework/session/SessionDB.php diff --git a/webfiori/framework/session/SessionOption.php b/webfiori - Copy/framework/session/SessionOption.php similarity index 100% rename from webfiori/framework/session/SessionOption.php rename to webfiori - Copy/framework/session/SessionOption.php diff --git a/webfiori/framework/session/SessionStatus.php b/webfiori - Copy/framework/session/SessionStatus.php similarity index 100% rename from webfiori/framework/session/SessionStatus.php rename to webfiori - Copy/framework/session/SessionStatus.php diff --git a/webfiori/framework/session/SessionStorage.php b/webfiori - Copy/framework/session/SessionStorage.php similarity index 100% rename from webfiori/framework/session/SessionStorage.php rename to webfiori - Copy/framework/session/SessionStorage.php diff --git a/webfiori/framework/session/SessionUser.php b/webfiori - Copy/framework/session/SessionUser.php similarity index 100% rename from webfiori/framework/session/SessionUser.php rename to webfiori - Copy/framework/session/SessionUser.php diff --git a/webfiori/framework/session/SessionsManager.php b/webfiori - Copy/framework/session/SessionsManager.php similarity index 100% rename from webfiori/framework/session/SessionsManager.php rename to webfiori - Copy/framework/session/SessionsManager.php diff --git a/webfiori/framework/ui/BeforeRenderCallback.php b/webfiori - Copy/framework/ui/BeforeRenderCallback.php similarity index 100% rename from webfiori/framework/ui/BeforeRenderCallback.php rename to webfiori - Copy/framework/ui/BeforeRenderCallback.php diff --git a/webfiori/framework/ui/HTTPCodeView.php b/webfiori - Copy/framework/ui/HTTPCodeView.php similarity index 100% rename from webfiori/framework/ui/HTTPCodeView.php rename to webfiori - Copy/framework/ui/HTTPCodeView.php diff --git a/webfiori/framework/ui/MessageBox.php b/webfiori - Copy/framework/ui/MessageBox.php similarity index 100% rename from webfiori/framework/ui/MessageBox.php rename to webfiori - Copy/framework/ui/MessageBox.php diff --git a/webfiori/framework/ui/StarterPage.php b/webfiori - Copy/framework/ui/StarterPage.php similarity index 100% rename from webfiori/framework/ui/StarterPage.php rename to webfiori - Copy/framework/ui/StarterPage.php diff --git a/webfiori/framework/ui/WebPage.php b/webfiori - Copy/framework/ui/WebPage.php similarity index 100% rename from webfiori/framework/ui/WebPage.php rename to webfiori - Copy/framework/ui/WebPage.php diff --git a/webfiori/framework/ui/serverErrPage/ServerErrPage.php b/webfiori - Copy/framework/ui/serverErrPage/ServerErrPage.php similarity index 100% rename from webfiori/framework/ui/serverErrPage/ServerErrPage.php rename to webfiori - Copy/framework/ui/serverErrPage/ServerErrPage.php diff --git a/webfiori/framework/ui/serverErrPage/error-details.php b/webfiori - Copy/framework/ui/serverErrPage/error-details.php similarity index 100% rename from webfiori/framework/ui/serverErrPage/error-details.php rename to webfiori - Copy/framework/ui/serverErrPage/error-details.php diff --git a/webfiori/framework/ui/serverErrPage/server-err-head.php b/webfiori - Copy/framework/ui/serverErrPage/server-err-head.php similarity index 100% rename from webfiori/framework/ui/serverErrPage/server-err-head.php rename to webfiori - Copy/framework/ui/serverErrPage/server-err-head.php diff --git a/webfiori/framework/ui/serverErrPage/server-err-header.php b/webfiori - Copy/framework/ui/serverErrPage/server-err-header.php similarity index 100% rename from webfiori/framework/ui/serverErrPage/server-err-header.php rename to webfiori - Copy/framework/ui/serverErrPage/server-err-header.php diff --git a/webfiori/framework/ui/serverErrPage/server-err-stack-trace.php b/webfiori - Copy/framework/ui/serverErrPage/server-err-stack-trace.php similarity index 100% rename from webfiori/framework/ui/serverErrPage/server-err-stack-trace.php rename to webfiori - Copy/framework/ui/serverErrPage/server-err-stack-trace.php diff --git a/webfiori/framework/ui/ui-functions.php b/webfiori - Copy/framework/ui/ui-functions.php similarity index 100% rename from webfiori/framework/ui/ui-functions.php rename to webfiori - Copy/framework/ui/ui-functions.php diff --git a/webfiori/framework/writers/APITestCaseWriter.php b/webfiori - Copy/framework/writers/APITestCaseWriter.php similarity index 100% rename from webfiori/framework/writers/APITestCaseWriter.php rename to webfiori - Copy/framework/writers/APITestCaseWriter.php diff --git a/webfiori/framework/writers/ClassWriter.php b/webfiori - Copy/framework/writers/ClassWriter.php similarity index 100% rename from webfiori/framework/writers/ClassWriter.php rename to webfiori - Copy/framework/writers/ClassWriter.php diff --git a/webfiori/framework/writers/CommandClassWriter.php b/webfiori - Copy/framework/writers/CommandClassWriter.php similarity index 100% rename from webfiori/framework/writers/CommandClassWriter.php rename to webfiori - Copy/framework/writers/CommandClassWriter.php diff --git a/webfiori/framework/writers/DBClassWriter.php b/webfiori - Copy/framework/writers/DBClassWriter.php similarity index 100% rename from webfiori/framework/writers/DBClassWriter.php rename to webfiori - Copy/framework/writers/DBClassWriter.php diff --git a/webfiori/framework/writers/DatabaseMigrationWriter.php b/webfiori - Copy/framework/writers/DatabaseMigrationWriter.php similarity index 100% rename from webfiori/framework/writers/DatabaseMigrationWriter.php rename to webfiori - Copy/framework/writers/DatabaseMigrationWriter.php diff --git a/webfiori/framework/writers/LangClassWriter.php b/webfiori - Copy/framework/writers/LangClassWriter.php similarity index 100% rename from webfiori/framework/writers/LangClassWriter.php rename to webfiori - Copy/framework/writers/LangClassWriter.php diff --git a/webfiori/framework/writers/MiddlewareClassWriter.php b/webfiori - Copy/framework/writers/MiddlewareClassWriter.php similarity index 100% rename from webfiori/framework/writers/MiddlewareClassWriter.php rename to webfiori - Copy/framework/writers/MiddlewareClassWriter.php diff --git a/webfiori/framework/writers/SchedulerTaskClassWriter.php b/webfiori - Copy/framework/writers/SchedulerTaskClassWriter.php similarity index 100% rename from webfiori/framework/writers/SchedulerTaskClassWriter.php rename to webfiori - Copy/framework/writers/SchedulerTaskClassWriter.php diff --git a/webfiori/framework/writers/ServiceHolder.php b/webfiori - Copy/framework/writers/ServiceHolder.php similarity index 100% rename from webfiori/framework/writers/ServiceHolder.php rename to webfiori - Copy/framework/writers/ServiceHolder.php diff --git a/webfiori/framework/writers/TableClassWriter.php b/webfiori - Copy/framework/writers/TableClassWriter.php similarity index 100% rename from webfiori/framework/writers/TableClassWriter.php rename to webfiori - Copy/framework/writers/TableClassWriter.php diff --git a/webfiori/framework/writers/ThemeClassWriter.php b/webfiori - Copy/framework/writers/ThemeClassWriter.php similarity index 100% rename from webfiori/framework/writers/ThemeClassWriter.php rename to webfiori - Copy/framework/writers/ThemeClassWriter.php diff --git a/webfiori/framework/writers/ThemeComponentWriter.php b/webfiori - Copy/framework/writers/ThemeComponentWriter.php similarity index 100% rename from webfiori/framework/writers/ThemeComponentWriter.php rename to webfiori - Copy/framework/writers/ThemeComponentWriter.php diff --git a/webfiori/framework/writers/WebServiceWriter.php b/webfiori - Copy/framework/writers/WebServiceWriter.php similarity index 100% rename from webfiori/framework/writers/WebServiceWriter.php rename to webfiori - Copy/framework/writers/WebServiceWriter.php diff --git a/webfiori/db/temp b/webfiori/db/temp deleted file mode 100644 index 8b1378917..000000000 --- a/webfiori/db/temp +++ /dev/null @@ -1 +0,0 @@ - From 713304fb8de89bdfaf60bd2af28b1152386bff63 Mon Sep 17 00:00:00 2001 From: Ibrahim BinAlshikh Date: Tue, 7 Oct 2025 19:20:23 +0300 Subject: [PATCH 02/45] refactor: Moved Files --- .../framework => WebFiori/Framework}/Access.php | 0 .../framework => WebFiori/Framework}/App.php | 0 .../Framework/Autoload}/ClassInfo.php | 0 .../Framework/Autoload}/ClassLoader.php | 0 .../Framework/Autoload}/ClassLoaderException.php | 0 .../cli => WebFiori/Framework/Cli}/CLITestCase.php | 0 .../cli => WebFiori/Framework/Cli}/CLIUtils.php | 0 .../Framework/Cli/Commands}/AddCommand.php | 0 .../Framework/Cli/Commands}/CreateCommand.php | 0 .../Framework/Cli/Commands}/ListRoutesCommand.php | 0 .../Framework/Cli/Commands}/ListThemesCommand.php | 0 .../Cli/Commands}/RunMigrationsCommand.php | 0 .../Framework/Cli/Commands}/RunSQLQueryCommand.php | 0 .../Framework/Cli/Commands}/SchedulerCommand.php | 0 .../Framework/Cli/Commands}/SettingsCommand.php | 0 .../Cli/Commands}/UpdateSettingsCommand.php | 0 .../Framework/Cli/Commands}/UpdateTableCommand.php | 0 .../Framework/Cli/Commands}/VersionCommand.php | 0 .../Framework/Cli/Commands}/WHelpCommand.php | 0 .../Framework/Cli/Helpers}/ClassInfoReader.php | 0 .../Framework/Cli/Helpers}/CreateAPITestCase.php | 0 .../Framework/Cli/Helpers}/CreateBackgroundTask.php | 0 .../Framework/Cli/Helpers}/CreateCLIClassHelper.php | 0 .../Framework/Cli/Helpers}/CreateClassHelper.php | 0 .../Framework/Cli/Helpers}/CreateDBAccessHelper.php | 0 .../Framework/Cli/Helpers}/CreateFullRESTHelper.php | 0 .../Framework/Cli/Helpers}/CreateMiddleware.php | 0 .../Framework/Cli/Helpers}/CreateMigration.php | 0 .../Framework/Cli/Helpers}/CreateTableObj.php | 0 .../Framework/Cli/Helpers}/CreateThemeHelper.php | 0 .../Framework/Cli/Helpers}/CreateWebService.php | 0 .../Framework/Cli/Helpers}/TableObjHelper.php | 0 .../Framework/Config}/ClassDriver.php | 0 .../Framework/Config}/ConfigurationDriver.php | 0 .../Framework/Config}/Controller.php | 0 .../Framework/Config}/JsonDriver.php | 0 .../framework => WebFiori/Framework}/DB.php | 0 .../Framework}/EmailMessage.php | 0 .../Exceptions}/ArrayIndexOutOfBoundsException.php | 0 .../Exceptions}/InitializationException.php | 0 .../Exceptions}/InvalidCRONExprException.php | 0 .../Framework/Exceptions}/MissingLangException.php | 0 .../Framework/Exceptions}/NoSuchThemeException.php | 0 .../Framework/Exceptions}/RoutingException.php | 0 .../Framework/Exceptions}/SessionException.php | 0 .../Framework/Exceptions}/UIException.php | 0 .../Framework}/ExtendedWebServicesManager.php | 0 .../Framework/Handlers}/APICallErrHandler.php | 0 .../Framework/Handlers}/CLIErrHandler.php | 0 .../Framework/Handlers}/HTTPErrHandler.php | 0 .../framework => WebFiori/Framework}/Ini.php | 0 .../framework => WebFiori/Framework}/Lang.php | 0 .../Framework/Middleware}/AbstractMiddleware.php | 0 .../Framework/Middleware}/CacheMiddleware.php | 0 .../Framework/Middleware}/MiddlewareManager.php | 0 .../Middleware}/StartSessionMiddleware.php | 0 .../framework => WebFiori/Framework}/Privilege.php | 0 .../Framework}/PrivilegesGroup.php | 0 .../Framework/Router}/RouteOption.php | 0 .../router => WebFiori/Framework/Router}/Router.php | 0 .../Framework/Router}/RouterUri.php | 0 .../Framework/Scheduler}/AbstractTask.php | 0 .../Framework/Scheduler}/BaseTask.php | 0 .../Framework/Scheduler}/TaskArgument.php | 0 .../Framework/Scheduler}/TaskStatusEmail.php | 0 .../Framework/Scheduler}/TasksManager.php | 0 .../WebServices}/ForceTaskExecutionService.php | 0 .../Scheduler/WebServices}/GetTasksService.php | 0 .../WebServices}/PrivateSchedulerService.php | 0 .../Scheduler/WebServices}/SetupPasswordService.php | 0 .../Scheduler/WebServices}/TasksLoginService.php | 0 .../Scheduler/WebServices}/TasksLogoutService.php | 0 .../Scheduler/WebServices}/TasksServicesManager.php | 0 .../Framework/Scheduler/WebUI}/BaseTasksPage.php | 0 .../Framework/Scheduler/WebUI}/ListTasksPage.php | 0 .../Framework/Scheduler/WebUI}/SetPasswordPage.php | 0 .../Framework/Scheduler/WebUI}/TasksLoginPage.php | 0 .../Framework/Scheduler/WebUI}/TasksTable.php | 0 .../templates/job-execution-status-dialog.html | 0 .../WebUI}/templates/job-output-dialog.html | 0 .../Scheduler/WebUI}/templates/login-form.html | 0 .../Scheduler/WebUI}/templates/message-dialog.html | 0 .../Scheduler/WebUI}/templates/scheduler-head.php | 0 .../WebUI}/templates/set-password-form.html | 0 .../Scheduler/WebUI}/templates/tasks-table.html | 0 .../Framework/Session}/DatabaseSessionStorage.php | 0 .../Framework/Session}/DefaultSessionStorage.php | 0 .../Framework/Session}/MSSQLSessionDataTable.php | 0 .../Framework/Session}/MSSQLSessionsTable.php | 0 .../Framework/Session}/MySQLSessionDataTable.php | 0 .../Framework/Session}/MySQLSessionsTable.php | 0 .../Framework/Session}/Session.php | 0 .../Framework/Session}/SessionDB.php | 0 .../Framework/Session}/SessionOption.php | 0 .../Framework/Session}/SessionStatus.php | 0 .../Framework/Session}/SessionStorage.php | 0 .../Framework/Session}/SessionUser.php | 0 .../Framework/Session}/SessionsManager.php | 0 .../framework => WebFiori/Framework}/Theme.php | 0 .../Framework}/ThemeManager.php | 0 .../Framework/Ui}/BeforeRenderCallback.php | 0 .../ui => WebFiori/Framework/Ui}/HTTPCodeView.php | 0 .../ui => WebFiori/Framework/Ui}/MessageBox.php | 0 .../Framework/Ui/ServerErrPage}/ServerErrPage.php | 0 .../Framework/Ui/ServerErrPage}/error-details.php | 0 .../Framework/Ui/ServerErrPage}/server-err-head.php | 0 .../Ui/ServerErrPage}/server-err-header.php | 0 .../Ui/ServerErrPage}/server-err-stack-trace.php | 0 .../ui => WebFiori/Framework/Ui}/StarterPage.php | 0 .../ui => WebFiori/Framework/Ui}/WebPage.php | 0 .../ui => WebFiori/Framework/Ui}/ui-functions.php | 0 .../framework => WebFiori/Framework}/User.php | 0 .../framework => WebFiori/Framework}/Util.php | 0 .../Framework/Writers}/APITestCaseWriter.php | 0 .../Framework/Writers}/ClassWriter.php | 0 .../Framework/Writers}/CommandClassWriter.php | 0 .../Framework/Writers}/DBClassWriter.php | 0 .../Framework/Writers}/DatabaseMigrationWriter.php | 0 .../Framework/Writers}/LangClassWriter.php | 0 .../Framework/Writers}/MiddlewareClassWriter.php | 0 .../Framework/Writers}/SchedulerTaskClassWriter.php | 0 .../Framework/Writers}/ServiceHolder.php | 0 .../Framework/Writers}/TableClassWriter.php | 0 .../Framework/Writers}/ThemeClassWriter.php | 0 .../Framework/Writers}/ThemeComponentWriter.php | 0 .../Framework/Writers}/WebServiceWriter.php | 0 app/tasks/temp | 1 - app/themes/cool/temp | 1 - {app => appp}/apis/.gitkeep | 0 {app => appp}/apis/RoutingTestClass.php | 0 {app => appp}/apis/super/temp | 0 {app => appp}/commands/.gitkeep | 0 {app => appp}/config/config-with-err-00.json | 0 {app => appp}/database/Test2Table.php | 0 {app => appp}/database/TestTable.php | 0 {app => appp}/database/empl/temp | 0 {app => appp}/database/migrations/.gitkeep | 0 {app => appp}/database/migrations/commands/.gitkeep | 0 .../database/migrations/emptyRunner/XRunner.php | 0 .../database/migrations/multi/Migration000.php | 0 .../database/migrations/multi/Migration001.php | 0 .../database/migrations/multi/Migration002.php | 0 .../database/migrations/multi/MultiRunner.php | 0 .../migrations/multiDownErr/Migration000.php | 0 .../migrations/multiDownErr/Migration001.php | 0 .../migrations/multiDownErr/Migration002.php | 0 .../migrations/multiDownErr/MultiErrRunner.php | 0 .../database/migrations/multiErr/Migration000.php | 0 .../database/migrations/multiErr/Migration001.php | 0 .../database/migrations/multiErr/Migration002.php | 0 .../database/migrations/multiErr/MultiErrRunner.php | 0 .../database/migrations/noConn/Migration000.php | 0 .../database/migrations/noConn/XRunner.php | 0 {app => appp}/database/sql-file.sql | 0 {app => appp}/database/super/temp | 0 {app => appp}/entity/WithException.php | 0 {app => appp}/ini/InitAutoLoad.php | 0 {app => appp}/ini/InitCliCommands.php | 0 {app => appp}/ini/InitCommands.php | 0 {app => appp}/ini/InitMiddleware.php | 0 {app => appp}/ini/InitPrivileges.php | 0 {app => appp}/ini/InitTasks.php | 0 {app => appp}/ini/routes/APIsRoutes.php | 0 {app => appp}/ini/routes/ClosureRoutes.php | 0 {app => appp}/ini/routes/OtherRoutes.php | 0 {app => appp}/ini/routes/PagesRoutes.php | 0 {app => appp}/langs/LangAR.php | 0 {app => appp}/langs/LangEN.php | 0 {app => appp}/langs/LangFR.php | 0 {app => appp}/langs/LangGB.php | 0 {app => appp}/langs/LangJP.php | 0 {app => appp}/middleware/CoolMiddleware.php | 0 {app/entity/super => appp/middleware}/temp | 0 {app => appp}/tasks/Fail1TestTask.php | 0 {app => appp}/tasks/Fail2TestTask.php | 0 {app => appp}/tasks/Fail3TestTask.php | 0 {app => appp}/tasks/SuccessTestEveryMinute.php | 0 {app => appp}/tasks/SuccessTestTask.php | 0 {app/entity => appp/tasks}/temp | 0 {app/middleware => appp/themes/cool}/temp | 0 .../EmptyService}/EmptyServicesManager.php | 0 .../Multiple}/ServicesManager00.php | 0 .../multiple => Apiss/Multiple}/WebService00.php | 0 .../multiple => Apiss/Multiple}/WebService01.php | 0 tests/{tables => Tabless}/EmployeeInfoTable.php | 0 tests/{tables => Tabless}/PositionInfoTable.php | 0 tests/{tables => Tabless}/Schema.php | 0 tests/{tables => Tabless}/Schema2.php | 0 tests/{tables => Tabless}/Schema3.php | 0 tests/{tables => Tabless}/UserInfoTable.php | 0 .../TestMiddleware.php | 0 .../UserContactInfo.php | 0 .../UserWithContact.php | 0 .../{test-entities => TestEntities}/UsersQuery.php | 0 .../Benchmark}/RouterBench.php | 0 .../Framework/Tests}/AccessTest.php | 0 .../Framework/Tests}/ClassUtilTest.php | 0 .../Framework/Tests/Cli}/AddCommandTest.php | 0 .../Framework/Tests/Cli}/CreateAPITestCaseTest.php | 0 .../Framework/Tests/Cli}/CreateCLICommandTest.php | 0 .../Framework/Tests/Cli}/CreateCommandTest.php | 0 .../Framework/Tests/Cli}/CreateDBAccessTest.php | 0 .../Framework/Tests/Cli}/CreateEntityTest.php | 0 .../Framework/Tests/Cli}/CreateMiddlewareTest.php | 0 .../Framework/Tests/Cli}/CreateMigrationTest.php | 0 .../Framework/Tests/Cli}/CreateRESTTest.php | 0 .../Framework/Tests/Cli}/CreateTableTest.php | 0 .../Framework/Tests/Cli}/CreateTaskTest.php | 0 .../Framework/Tests/Cli}/CreateThemeTest.php | 0 .../Framework/Tests/Cli}/CreateWebServiceTest.php | 0 .../Framework/Tests/Cli}/DBClassWritterTest.php | 0 .../Framework/Tests/Cli}/HelpCommandTest.php | 0 .../Framework/Tests/Cli}/ListRoutesCommandTest.php | 0 .../Framework/Tests/Cli}/ListThemesCommandTest.php | 0 .../Tests/Cli}/RunMigrationsCommandTest.php | 0 .../Framework/Tests/Cli}/RunSQLCommandTest.php | 0 .../Framework/Tests/Cli}/SchedulerCommandTest.php | 0 .../Framework/Tests/Cli}/SettingsCommandTest.php | 0 .../Tests/Cli}/UpdateSettingsCommandTest.php | 0 .../Framework/Tests/Cli}/UpdateTableCommandTest.php | 0 .../Framework/Tests/Cli}/VersionCommandTest.php | 0 .../Framework/Tests/Config}/JsonDriverTest.php | 0 .../test => WebFiori/Framework/Tests}/DBTest.php | 0 .../Framework/Tests/Langs}/LanguageTest.php | 0 .../Framework/Tests/Mail}/EmailMessageTest.php | 0 .../test => WebFiori/Framework/Tests}/PageTest.php | 0 .../Framework/Tests}/PrivilegeTest.php | 0 .../Framework/Tests}/PrivilegesGroupTest.php | 0 .../Framework/Tests}/ResponseTest.php | 0 .../Framework/Tests/Router}/RouterTest.php | 0 .../Framework/Tests/Router}/RouterUriTest.php | 0 .../Framework/Tests/Scheduler}/JobArgumentTest.php | 0 .../Tests/Scheduler}/SchedulerTaskTest.php | 0 .../Framework/Tests/Scheduler}/SchedulerTest.php | 0 .../Framework/Tests/Session}/SessionTest.php | 0 .../Tests/Session}/SessionsManagerTest.php | 0 .../Framework/Tests}/TestAutoLoader.php | 0 .../Framework/Tests/Theme}/ThemeTest.php | 0 .../test => WebFiori/Framework/Tests}/UserTest.php | 0 .../test => WebFiori/Framework/Tests}/UtilTest.php | 0 .../Tests/Writers}/BackgroundTaskWritterTest.php | 0 .../Tests/Writers}/CLICommandClassWriterTest.php | 0 .../Tests/Writers}/DatabaseMigrationWriterTest.php | 0 .../Framework/Tests/Writers}/LangWritterTest.php | 0 .../Tests/Writers}/MiddlewareWritterTest.php | 0 .../Framework/Tests/Writers}/TableWritterTest.php | 0 .../Framework/Tests/Writers}/ThemeWritterTest.php | 0 .../Tests/Writers}/WebServiceTestCaseWriterTest.php | 0 .../Tests/Writers}/WebServiceWritterTest.php | 0 {themes => themess}/fiori/.gitkeep | 0 {themes => themess}/fioriTheme/AsideSection.php | 0 {themes => themess}/fioriTheme/FooterSection.php | 0 {themes => themess}/fioriTheme/HeadSection.php | 0 {themes => themess}/fioriTheme/HeaderSection.php | 0 {themes => themess}/fioriTheme/NewFTestTheme.php | 0 {themes => themess}/fioriTheme/assets/css/main.css | 0 .../fioriTheme/assets/images/favicon.png | Bin {themes => themess}/fioriTheme/assets/js/main.js | 0 {themes => themess}/fioriTheme2/AsideSection.php | 0 {themes => themess}/fioriTheme2/FooterSection.php | 0 {themes => themess}/fioriTheme2/HeadSection.php | 0 {themes => themess}/fioriTheme2/HeaderSection.php | 0 {themes => themess}/fioriTheme2/NewTestTheme2.php | 0 263 files changed, 2 deletions(-) rename {webfiori - Copy/framework => WebFiori/Framework}/Access.php (100%) rename {webfiori - Copy/framework => WebFiori/Framework}/App.php (100%) rename {webfiori - Copy/framework/autoload => WebFiori/Framework/Autoload}/ClassInfo.php (100%) rename {webfiori - Copy/framework/autoload => WebFiori/Framework/Autoload}/ClassLoader.php (100%) rename {webfiori - Copy/framework/autoload => WebFiori/Framework/Autoload}/ClassLoaderException.php (100%) rename {webfiori - Copy/framework/cli => WebFiori/Framework/Cli}/CLITestCase.php (100%) rename {webfiori - Copy/framework/cli => WebFiori/Framework/Cli}/CLIUtils.php (100%) rename {webfiori - Copy/framework/cli/commands => WebFiori/Framework/Cli/Commands}/AddCommand.php (100%) rename {webfiori - Copy/framework/cli/commands => WebFiori/Framework/Cli/Commands}/CreateCommand.php (100%) rename {webfiori - Copy/framework/cli/commands => WebFiori/Framework/Cli/Commands}/ListRoutesCommand.php (100%) rename {webfiori - Copy/framework/cli/commands => WebFiori/Framework/Cli/Commands}/ListThemesCommand.php (100%) rename {webfiori - Copy/framework/cli/commands => WebFiori/Framework/Cli/Commands}/RunMigrationsCommand.php (100%) rename {webfiori - Copy/framework/cli/commands => WebFiori/Framework/Cli/Commands}/RunSQLQueryCommand.php (100%) rename {webfiori - Copy/framework/cli/commands => WebFiori/Framework/Cli/Commands}/SchedulerCommand.php (100%) rename {webfiori - Copy/framework/cli/commands => WebFiori/Framework/Cli/Commands}/SettingsCommand.php (100%) rename {webfiori - Copy/framework/cli/commands => WebFiori/Framework/Cli/Commands}/UpdateSettingsCommand.php (100%) rename {webfiori - Copy/framework/cli/commands => WebFiori/Framework/Cli/Commands}/UpdateTableCommand.php (100%) rename {webfiori - Copy/framework/cli/commands => WebFiori/Framework/Cli/Commands}/VersionCommand.php (100%) rename {webfiori - Copy/framework/cli/commands => WebFiori/Framework/Cli/Commands}/WHelpCommand.php (100%) rename {webfiori - Copy/framework/cli/helpers => WebFiori/Framework/Cli/Helpers}/ClassInfoReader.php (100%) rename {webfiori - Copy/framework/cli/helpers => WebFiori/Framework/Cli/Helpers}/CreateAPITestCase.php (100%) rename {webfiori - Copy/framework/cli/helpers => WebFiori/Framework/Cli/Helpers}/CreateBackgroundTask.php (100%) rename {webfiori - Copy/framework/cli/helpers => WebFiori/Framework/Cli/Helpers}/CreateCLIClassHelper.php (100%) rename {webfiori - Copy/framework/cli/helpers => WebFiori/Framework/Cli/Helpers}/CreateClassHelper.php (100%) rename {webfiori - Copy/framework/cli/helpers => WebFiori/Framework/Cli/Helpers}/CreateDBAccessHelper.php (100%) rename {webfiori - Copy/framework/cli/helpers => WebFiori/Framework/Cli/Helpers}/CreateFullRESTHelper.php (100%) rename {webfiori - Copy/framework/cli/helpers => WebFiori/Framework/Cli/Helpers}/CreateMiddleware.php (100%) rename {webfiori - Copy/framework/cli/helpers => WebFiori/Framework/Cli/Helpers}/CreateMigration.php (100%) rename {webfiori - Copy/framework/cli/helpers => WebFiori/Framework/Cli/Helpers}/CreateTableObj.php (100%) rename {webfiori - Copy/framework/cli/helpers => WebFiori/Framework/Cli/Helpers}/CreateThemeHelper.php (100%) rename {webfiori - Copy/framework/cli/helpers => WebFiori/Framework/Cli/Helpers}/CreateWebService.php (100%) rename {webfiori - Copy/framework/cli/helpers => WebFiori/Framework/Cli/Helpers}/TableObjHelper.php (100%) rename {webfiori - Copy/framework/config => WebFiori/Framework/Config}/ClassDriver.php (100%) rename {webfiori - Copy/framework/config => WebFiori/Framework/Config}/ConfigurationDriver.php (100%) rename {webfiori - Copy/framework/config => WebFiori/Framework/Config}/Controller.php (100%) rename {webfiori - Copy/framework/config => WebFiori/Framework/Config}/JsonDriver.php (100%) rename {webfiori - Copy/framework => WebFiori/Framework}/DB.php (100%) rename {webfiori - Copy/framework => WebFiori/Framework}/EmailMessage.php (100%) rename {webfiori - Copy/framework/exceptions => WebFiori/Framework/Exceptions}/ArrayIndexOutOfBoundsException.php (100%) rename {webfiori - Copy/framework/exceptions => WebFiori/Framework/Exceptions}/InitializationException.php (100%) rename {webfiori - Copy/framework/exceptions => WebFiori/Framework/Exceptions}/InvalidCRONExprException.php (100%) rename {webfiori - Copy/framework/exceptions => WebFiori/Framework/Exceptions}/MissingLangException.php (100%) rename {webfiori - Copy/framework/exceptions => WebFiori/Framework/Exceptions}/NoSuchThemeException.php (100%) rename {webfiori - Copy/framework/exceptions => WebFiori/Framework/Exceptions}/RoutingException.php (100%) rename {webfiori - Copy/framework/exceptions => WebFiori/Framework/Exceptions}/SessionException.php (100%) rename {webfiori - Copy/framework/exceptions => WebFiori/Framework/Exceptions}/UIException.php (100%) rename {webfiori - Copy/framework => WebFiori/Framework}/ExtendedWebServicesManager.php (100%) rename {webfiori - Copy/framework/handlers => WebFiori/Framework/Handlers}/APICallErrHandler.php (100%) rename {webfiori - Copy/framework/handlers => WebFiori/Framework/Handlers}/CLIErrHandler.php (100%) rename {webfiori - Copy/framework/handlers => WebFiori/Framework/Handlers}/HTTPErrHandler.php (100%) rename {webfiori - Copy/framework => WebFiori/Framework}/Ini.php (100%) rename {webfiori - Copy/framework => WebFiori/Framework}/Lang.php (100%) rename {webfiori - Copy/framework/middleware => WebFiori/Framework/Middleware}/AbstractMiddleware.php (100%) rename {webfiori - Copy/framework/middleware => WebFiori/Framework/Middleware}/CacheMiddleware.php (100%) rename {webfiori - Copy/framework/middleware => WebFiori/Framework/Middleware}/MiddlewareManager.php (100%) rename {webfiori - Copy/framework/middleware => WebFiori/Framework/Middleware}/StartSessionMiddleware.php (100%) rename {webfiori - Copy/framework => WebFiori/Framework}/Privilege.php (100%) rename {webfiori - Copy/framework => WebFiori/Framework}/PrivilegesGroup.php (100%) rename {webfiori - Copy/framework/router => WebFiori/Framework/Router}/RouteOption.php (100%) rename {webfiori - Copy/framework/router => WebFiori/Framework/Router}/Router.php (100%) rename {webfiori - Copy/framework/router => WebFiori/Framework/Router}/RouterUri.php (100%) rename {webfiori - Copy/framework/scheduler => WebFiori/Framework/Scheduler}/AbstractTask.php (100%) rename {webfiori - Copy/framework/scheduler => WebFiori/Framework/Scheduler}/BaseTask.php (100%) rename {webfiori - Copy/framework/scheduler => WebFiori/Framework/Scheduler}/TaskArgument.php (100%) rename {webfiori - Copy/framework/scheduler => WebFiori/Framework/Scheduler}/TaskStatusEmail.php (100%) rename {webfiori - Copy/framework/scheduler => WebFiori/Framework/Scheduler}/TasksManager.php (100%) rename {webfiori - Copy/framework/scheduler/webServices => WebFiori/Framework/Scheduler/WebServices}/ForceTaskExecutionService.php (100%) rename {webfiori - Copy/framework/scheduler/webServices => WebFiori/Framework/Scheduler/WebServices}/GetTasksService.php (100%) rename {webfiori - Copy/framework/scheduler/webServices => WebFiori/Framework/Scheduler/WebServices}/PrivateSchedulerService.php (100%) rename {webfiori - Copy/framework/scheduler/webServices => WebFiori/Framework/Scheduler/WebServices}/SetupPasswordService.php (100%) rename {webfiori - Copy/framework/scheduler/webServices => WebFiori/Framework/Scheduler/WebServices}/TasksLoginService.php (100%) rename {webfiori - Copy/framework/scheduler/webServices => WebFiori/Framework/Scheduler/WebServices}/TasksLogoutService.php (100%) rename {webfiori - Copy/framework/scheduler/webServices => WebFiori/Framework/Scheduler/WebServices}/TasksServicesManager.php (100%) rename {webfiori - Copy/framework/scheduler/webUI => WebFiori/Framework/Scheduler/WebUI}/BaseTasksPage.php (100%) rename {webfiori - Copy/framework/scheduler/webUI => WebFiori/Framework/Scheduler/WebUI}/ListTasksPage.php (100%) rename {webfiori - Copy/framework/scheduler/webUI => WebFiori/Framework/Scheduler/WebUI}/SetPasswordPage.php (100%) rename {webfiori - Copy/framework/scheduler/webUI => WebFiori/Framework/Scheduler/WebUI}/TasksLoginPage.php (100%) rename {webfiori - Copy/framework/scheduler/webUI => WebFiori/Framework/Scheduler/WebUI}/TasksTable.php (100%) rename {webfiori - Copy/framework/scheduler/webUI => WebFiori/Framework/Scheduler/WebUI}/templates/job-execution-status-dialog.html (100%) rename {webfiori - Copy/framework/scheduler/webUI => WebFiori/Framework/Scheduler/WebUI}/templates/job-output-dialog.html (100%) rename {webfiori - Copy/framework/scheduler/webUI => WebFiori/Framework/Scheduler/WebUI}/templates/login-form.html (100%) rename {webfiori - Copy/framework/scheduler/webUI => WebFiori/Framework/Scheduler/WebUI}/templates/message-dialog.html (100%) rename {webfiori - Copy/framework/scheduler/webUI => WebFiori/Framework/Scheduler/WebUI}/templates/scheduler-head.php (100%) rename {webfiori - Copy/framework/scheduler/webUI => WebFiori/Framework/Scheduler/WebUI}/templates/set-password-form.html (100%) rename {webfiori - Copy/framework/scheduler/webUI => WebFiori/Framework/Scheduler/WebUI}/templates/tasks-table.html (100%) rename {webfiori - Copy/framework/session => WebFiori/Framework/Session}/DatabaseSessionStorage.php (100%) rename {webfiori - Copy/framework/session => WebFiori/Framework/Session}/DefaultSessionStorage.php (100%) rename {webfiori - Copy/framework/session => WebFiori/Framework/Session}/MSSQLSessionDataTable.php (100%) rename {webfiori - Copy/framework/session => WebFiori/Framework/Session}/MSSQLSessionsTable.php (100%) rename {webfiori - Copy/framework/session => WebFiori/Framework/Session}/MySQLSessionDataTable.php (100%) rename {webfiori - Copy/framework/session => WebFiori/Framework/Session}/MySQLSessionsTable.php (100%) rename {webfiori - Copy/framework/session => WebFiori/Framework/Session}/Session.php (100%) rename {webfiori - Copy/framework/session => WebFiori/Framework/Session}/SessionDB.php (100%) rename {webfiori - Copy/framework/session => WebFiori/Framework/Session}/SessionOption.php (100%) rename {webfiori - Copy/framework/session => WebFiori/Framework/Session}/SessionStatus.php (100%) rename {webfiori - Copy/framework/session => WebFiori/Framework/Session}/SessionStorage.php (100%) rename {webfiori - Copy/framework/session => WebFiori/Framework/Session}/SessionUser.php (100%) rename {webfiori - Copy/framework/session => WebFiori/Framework/Session}/SessionsManager.php (100%) rename {webfiori - Copy/framework => WebFiori/Framework}/Theme.php (100%) rename {webfiori - Copy/framework => WebFiori/Framework}/ThemeManager.php (100%) rename {webfiori - Copy/framework/ui => WebFiori/Framework/Ui}/BeforeRenderCallback.php (100%) rename {webfiori - Copy/framework/ui => WebFiori/Framework/Ui}/HTTPCodeView.php (100%) rename {webfiori - Copy/framework/ui => WebFiori/Framework/Ui}/MessageBox.php (100%) rename {webfiori - Copy/framework/ui/serverErrPage => WebFiori/Framework/Ui/ServerErrPage}/ServerErrPage.php (100%) rename {webfiori - Copy/framework/ui/serverErrPage => WebFiori/Framework/Ui/ServerErrPage}/error-details.php (100%) rename {webfiori - Copy/framework/ui/serverErrPage => WebFiori/Framework/Ui/ServerErrPage}/server-err-head.php (100%) rename {webfiori - Copy/framework/ui/serverErrPage => WebFiori/Framework/Ui/ServerErrPage}/server-err-header.php (100%) rename {webfiori - Copy/framework/ui/serverErrPage => WebFiori/Framework/Ui/ServerErrPage}/server-err-stack-trace.php (100%) rename {webfiori - Copy/framework/ui => WebFiori/Framework/Ui}/StarterPage.php (100%) rename {webfiori - Copy/framework/ui => WebFiori/Framework/Ui}/WebPage.php (100%) rename {webfiori - Copy/framework/ui => WebFiori/Framework/Ui}/ui-functions.php (100%) rename {webfiori - Copy/framework => WebFiori/Framework}/User.php (100%) rename {webfiori - Copy/framework => WebFiori/Framework}/Util.php (100%) rename {webfiori - Copy/framework/writers => WebFiori/Framework/Writers}/APITestCaseWriter.php (100%) rename {webfiori - Copy/framework/writers => WebFiori/Framework/Writers}/ClassWriter.php (100%) rename {webfiori - Copy/framework/writers => WebFiori/Framework/Writers}/CommandClassWriter.php (100%) rename {webfiori - Copy/framework/writers => WebFiori/Framework/Writers}/DBClassWriter.php (100%) rename {webfiori - Copy/framework/writers => WebFiori/Framework/Writers}/DatabaseMigrationWriter.php (100%) rename {webfiori - Copy/framework/writers => WebFiori/Framework/Writers}/LangClassWriter.php (100%) rename {webfiori - Copy/framework/writers => WebFiori/Framework/Writers}/MiddlewareClassWriter.php (100%) rename {webfiori - Copy/framework/writers => WebFiori/Framework/Writers}/SchedulerTaskClassWriter.php (100%) rename {webfiori - Copy/framework/writers => WebFiori/Framework/Writers}/ServiceHolder.php (100%) rename {webfiori - Copy/framework/writers => WebFiori/Framework/Writers}/TableClassWriter.php (100%) rename {webfiori - Copy/framework/writers => WebFiori/Framework/Writers}/ThemeClassWriter.php (100%) rename {webfiori - Copy/framework/writers => WebFiori/Framework/Writers}/ThemeComponentWriter.php (100%) rename {webfiori - Copy/framework/writers => WebFiori/Framework/Writers}/WebServiceWriter.php (100%) delete mode 100644 app/tasks/temp delete mode 100644 app/themes/cool/temp rename {app => appp}/apis/.gitkeep (100%) rename {app => appp}/apis/RoutingTestClass.php (100%) rename {app => appp}/apis/super/temp (100%) rename {app => appp}/commands/.gitkeep (100%) rename {app => appp}/config/config-with-err-00.json (100%) rename {app => appp}/database/Test2Table.php (100%) rename {app => appp}/database/TestTable.php (100%) rename {app => appp}/database/empl/temp (100%) rename {app => appp}/database/migrations/.gitkeep (100%) rename {app => appp}/database/migrations/commands/.gitkeep (100%) rename {app => appp}/database/migrations/emptyRunner/XRunner.php (100%) rename {app => appp}/database/migrations/multi/Migration000.php (100%) rename {app => appp}/database/migrations/multi/Migration001.php (100%) rename {app => appp}/database/migrations/multi/Migration002.php (100%) rename {app => appp}/database/migrations/multi/MultiRunner.php (100%) rename {app => appp}/database/migrations/multiDownErr/Migration000.php (100%) rename {app => appp}/database/migrations/multiDownErr/Migration001.php (100%) rename {app => appp}/database/migrations/multiDownErr/Migration002.php (100%) rename {app => appp}/database/migrations/multiDownErr/MultiErrRunner.php (100%) rename {app => appp}/database/migrations/multiErr/Migration000.php (100%) rename {app => appp}/database/migrations/multiErr/Migration001.php (100%) rename {app => appp}/database/migrations/multiErr/Migration002.php (100%) rename {app => appp}/database/migrations/multiErr/MultiErrRunner.php (100%) rename {app => appp}/database/migrations/noConn/Migration000.php (100%) rename {app => appp}/database/migrations/noConn/XRunner.php (100%) rename {app => appp}/database/sql-file.sql (100%) rename {app => appp}/database/super/temp (100%) rename {app => appp}/entity/WithException.php (100%) rename {app => appp}/ini/InitAutoLoad.php (100%) rename {app => appp}/ini/InitCliCommands.php (100%) rename {app => appp}/ini/InitCommands.php (100%) rename {app => appp}/ini/InitMiddleware.php (100%) rename {app => appp}/ini/InitPrivileges.php (100%) rename {app => appp}/ini/InitTasks.php (100%) rename {app => appp}/ini/routes/APIsRoutes.php (100%) rename {app => appp}/ini/routes/ClosureRoutes.php (100%) rename {app => appp}/ini/routes/OtherRoutes.php (100%) rename {app => appp}/ini/routes/PagesRoutes.php (100%) rename {app => appp}/langs/LangAR.php (100%) rename {app => appp}/langs/LangEN.php (100%) rename {app => appp}/langs/LangFR.php (100%) rename {app => appp}/langs/LangGB.php (100%) rename {app => appp}/langs/LangJP.php (100%) rename {app => appp}/middleware/CoolMiddleware.php (100%) rename {app/entity/super => appp/middleware}/temp (100%) rename {app => appp}/tasks/Fail1TestTask.php (100%) rename {app => appp}/tasks/Fail2TestTask.php (100%) rename {app => appp}/tasks/Fail3TestTask.php (100%) rename {app => appp}/tasks/SuccessTestEveryMinute.php (100%) rename {app => appp}/tasks/SuccessTestTask.php (100%) rename {app/entity => appp/tasks}/temp (100%) rename {app/middleware => appp/themes/cool}/temp (100%) rename tests/{apis/emptyService => Apiss/EmptyService}/EmptyServicesManager.php (100%) rename tests/{apis/multiple => Apiss/Multiple}/ServicesManager00.php (100%) rename tests/{apis/multiple => Apiss/Multiple}/WebService00.php (100%) rename tests/{apis/multiple => Apiss/Multiple}/WebService01.php (100%) rename tests/{tables => Tabless}/EmployeeInfoTable.php (100%) rename tests/{tables => Tabless}/PositionInfoTable.php (100%) rename tests/{tables => Tabless}/Schema.php (100%) rename tests/{tables => Tabless}/Schema2.php (100%) rename tests/{tables => Tabless}/Schema3.php (100%) rename tests/{tables => Tabless}/UserInfoTable.php (100%) rename tests/{test-entities => TestEntities}/TestMiddleware.php (100%) rename tests/{test-entities => TestEntities}/UserContactInfo.php (100%) rename tests/{test-entities => TestEntities}/UserWithContact.php (100%) rename tests/{test-entities => TestEntities}/UsersQuery.php (100%) rename tests/{webfiori - Copy/benchmark => WebFiori/Benchmark}/RouterBench.php (100%) rename tests/{webfiori - Copy/framework/test => WebFiori/Framework/Tests}/AccessTest.php (100%) rename tests/{webfiori - Copy/framework/test => WebFiori/Framework/Tests}/ClassUtilTest.php (100%) rename tests/{webfiori - Copy/framework/test/cli => WebFiori/Framework/Tests/Cli}/AddCommandTest.php (100%) rename tests/{webfiori - Copy/framework/test/cli => WebFiori/Framework/Tests/Cli}/CreateAPITestCaseTest.php (100%) rename tests/{webfiori - Copy/framework/test/cli => WebFiori/Framework/Tests/Cli}/CreateCLICommandTest.php (100%) rename tests/{webfiori - Copy/framework/test/cli => WebFiori/Framework/Tests/Cli}/CreateCommandTest.php (100%) rename tests/{webfiori - Copy/framework/test/cli => WebFiori/Framework/Tests/Cli}/CreateDBAccessTest.php (100%) rename tests/{webfiori - Copy/framework/test/cli => WebFiori/Framework/Tests/Cli}/CreateEntityTest.php (100%) rename tests/{webfiori - Copy/framework/test/cli => WebFiori/Framework/Tests/Cli}/CreateMiddlewareTest.php (100%) rename tests/{webfiori - Copy/framework/test/cli => WebFiori/Framework/Tests/Cli}/CreateMigrationTest.php (100%) rename tests/{webfiori - Copy/framework/test/cli => WebFiori/Framework/Tests/Cli}/CreateRESTTest.php (100%) rename tests/{webfiori - Copy/framework/test/cli => WebFiori/Framework/Tests/Cli}/CreateTableTest.php (100%) rename tests/{webfiori - Copy/framework/test/cli => WebFiori/Framework/Tests/Cli}/CreateTaskTest.php (100%) rename tests/{webfiori - Copy/framework/test/cli => WebFiori/Framework/Tests/Cli}/CreateThemeTest.php (100%) rename tests/{webfiori - Copy/framework/test/cli => WebFiori/Framework/Tests/Cli}/CreateWebServiceTest.php (100%) rename tests/{webfiori - Copy/framework/test/cli => WebFiori/Framework/Tests/Cli}/DBClassWritterTest.php (100%) rename tests/{webfiori - Copy/framework/test/cli => WebFiori/Framework/Tests/Cli}/HelpCommandTest.php (100%) rename tests/{webfiori - Copy/framework/test/cli => WebFiori/Framework/Tests/Cli}/ListRoutesCommandTest.php (100%) rename tests/{webfiori - Copy/framework/test/cli => WebFiori/Framework/Tests/Cli}/ListThemesCommandTest.php (100%) rename tests/{webfiori - Copy/framework/test/cli => WebFiori/Framework/Tests/Cli}/RunMigrationsCommandTest.php (100%) rename tests/{webfiori - Copy/framework/test/cli => WebFiori/Framework/Tests/Cli}/RunSQLCommandTest.php (100%) rename tests/{webfiori - Copy/framework/test/cli => WebFiori/Framework/Tests/Cli}/SchedulerCommandTest.php (100%) rename tests/{webfiori - Copy/framework/test/cli => WebFiori/Framework/Tests/Cli}/SettingsCommandTest.php (100%) rename tests/{webfiori - Copy/framework/test/cli => WebFiori/Framework/Tests/Cli}/UpdateSettingsCommandTest.php (100%) rename tests/{webfiori - Copy/framework/test/cli => WebFiori/Framework/Tests/Cli}/UpdateTableCommandTest.php (100%) rename tests/{webfiori - Copy/framework/test/cli => WebFiori/Framework/Tests/Cli}/VersionCommandTest.php (100%) rename tests/{webfiori - Copy/framework/test/config => WebFiori/Framework/Tests/Config}/JsonDriverTest.php (100%) rename tests/{webfiori - Copy/framework/test => WebFiori/Framework/Tests}/DBTest.php (100%) rename tests/{webfiori - Copy/framework/test/langs => WebFiori/Framework/Tests/Langs}/LanguageTest.php (100%) rename tests/{webfiori - Copy/framework/test/mail => WebFiori/Framework/Tests/Mail}/EmailMessageTest.php (100%) rename tests/{webfiori - Copy/framework/test => WebFiori/Framework/Tests}/PageTest.php (100%) rename tests/{webfiori - Copy/framework/test => WebFiori/Framework/Tests}/PrivilegeTest.php (100%) rename tests/{webfiori - Copy/framework/test => WebFiori/Framework/Tests}/PrivilegesGroupTest.php (100%) rename tests/{webfiori - Copy/framework/test => WebFiori/Framework/Tests}/ResponseTest.php (100%) rename tests/{webfiori - Copy/framework/test/router => WebFiori/Framework/Tests/Router}/RouterTest.php (100%) rename tests/{webfiori - Copy/framework/test/router => WebFiori/Framework/Tests/Router}/RouterUriTest.php (100%) rename tests/{webfiori - Copy/framework/test/scheduler => WebFiori/Framework/Tests/Scheduler}/JobArgumentTest.php (100%) rename tests/{webfiori - Copy/framework/test/scheduler => WebFiori/Framework/Tests/Scheduler}/SchedulerTaskTest.php (100%) rename tests/{webfiori - Copy/framework/test/scheduler => WebFiori/Framework/Tests/Scheduler}/SchedulerTest.php (100%) rename tests/{webfiori - Copy/framework/test/session => WebFiori/Framework/Tests/Session}/SessionTest.php (100%) rename tests/{webfiori - Copy/framework/test/session => WebFiori/Framework/Tests/Session}/SessionsManagerTest.php (100%) rename tests/{webfiori - Copy/framework/test => WebFiori/Framework/Tests}/TestAutoLoader.php (100%) rename tests/{webfiori - Copy/framework/test/theme => WebFiori/Framework/Tests/Theme}/ThemeTest.php (100%) rename tests/{webfiori - Copy/framework/test => WebFiori/Framework/Tests}/UserTest.php (100%) rename tests/{webfiori - Copy/framework/test => WebFiori/Framework/Tests}/UtilTest.php (100%) rename tests/{webfiori - Copy/framework/test/writers => WebFiori/Framework/Tests/Writers}/BackgroundTaskWritterTest.php (100%) rename tests/{webfiori - Copy/framework/test/writers => WebFiori/Framework/Tests/Writers}/CLICommandClassWriterTest.php (100%) rename tests/{webfiori - Copy/framework/test/writers => WebFiori/Framework/Tests/Writers}/DatabaseMigrationWriterTest.php (100%) rename tests/{webfiori - Copy/framework/test/writers => WebFiori/Framework/Tests/Writers}/LangWritterTest.php (100%) rename tests/{webfiori - Copy/framework/test/writers => WebFiori/Framework/Tests/Writers}/MiddlewareWritterTest.php (100%) rename tests/{webfiori - Copy/framework/test/writers => WebFiori/Framework/Tests/Writers}/TableWritterTest.php (100%) rename tests/{webfiori - Copy/framework/test/writers => WebFiori/Framework/Tests/Writers}/ThemeWritterTest.php (100%) rename tests/{webfiori - Copy/framework/test/writers => WebFiori/Framework/Tests/Writers}/WebServiceTestCaseWriterTest.php (100%) rename tests/{webfiori - Copy/framework/test/writers => WebFiori/Framework/Tests/Writers}/WebServiceWritterTest.php (100%) rename {themes => themess}/fiori/.gitkeep (100%) rename {themes => themess}/fioriTheme/AsideSection.php (100%) rename {themes => themess}/fioriTheme/FooterSection.php (100%) rename {themes => themess}/fioriTheme/HeadSection.php (100%) rename {themes => themess}/fioriTheme/HeaderSection.php (100%) rename {themes => themess}/fioriTheme/NewFTestTheme.php (100%) rename {themes => themess}/fioriTheme/assets/css/main.css (100%) rename {themes => themess}/fioriTheme/assets/images/favicon.png (100%) rename {themes => themess}/fioriTheme/assets/js/main.js (100%) rename {themes => themess}/fioriTheme2/AsideSection.php (100%) rename {themes => themess}/fioriTheme2/FooterSection.php (100%) rename {themes => themess}/fioriTheme2/HeadSection.php (100%) rename {themes => themess}/fioriTheme2/HeaderSection.php (100%) rename {themes => themess}/fioriTheme2/NewTestTheme2.php (100%) diff --git a/webfiori - Copy/framework/Access.php b/WebFiori/Framework/Access.php similarity index 100% rename from webfiori - Copy/framework/Access.php rename to WebFiori/Framework/Access.php diff --git a/webfiori - Copy/framework/App.php b/WebFiori/Framework/App.php similarity index 100% rename from webfiori - Copy/framework/App.php rename to WebFiori/Framework/App.php diff --git a/webfiori - Copy/framework/autoload/ClassInfo.php b/WebFiori/Framework/Autoload/ClassInfo.php similarity index 100% rename from webfiori - Copy/framework/autoload/ClassInfo.php rename to WebFiori/Framework/Autoload/ClassInfo.php diff --git a/webfiori - Copy/framework/autoload/ClassLoader.php b/WebFiori/Framework/Autoload/ClassLoader.php similarity index 100% rename from webfiori - Copy/framework/autoload/ClassLoader.php rename to WebFiori/Framework/Autoload/ClassLoader.php diff --git a/webfiori - Copy/framework/autoload/ClassLoaderException.php b/WebFiori/Framework/Autoload/ClassLoaderException.php similarity index 100% rename from webfiori - Copy/framework/autoload/ClassLoaderException.php rename to WebFiori/Framework/Autoload/ClassLoaderException.php diff --git a/webfiori - Copy/framework/cli/CLITestCase.php b/WebFiori/Framework/Cli/CLITestCase.php similarity index 100% rename from webfiori - Copy/framework/cli/CLITestCase.php rename to WebFiori/Framework/Cli/CLITestCase.php diff --git a/webfiori - Copy/framework/cli/CLIUtils.php b/WebFiori/Framework/Cli/CLIUtils.php similarity index 100% rename from webfiori - Copy/framework/cli/CLIUtils.php rename to WebFiori/Framework/Cli/CLIUtils.php diff --git a/webfiori - Copy/framework/cli/commands/AddCommand.php b/WebFiori/Framework/Cli/Commands/AddCommand.php similarity index 100% rename from webfiori - Copy/framework/cli/commands/AddCommand.php rename to WebFiori/Framework/Cli/Commands/AddCommand.php diff --git a/webfiori - Copy/framework/cli/commands/CreateCommand.php b/WebFiori/Framework/Cli/Commands/CreateCommand.php similarity index 100% rename from webfiori - Copy/framework/cli/commands/CreateCommand.php rename to WebFiori/Framework/Cli/Commands/CreateCommand.php diff --git a/webfiori - Copy/framework/cli/commands/ListRoutesCommand.php b/WebFiori/Framework/Cli/Commands/ListRoutesCommand.php similarity index 100% rename from webfiori - Copy/framework/cli/commands/ListRoutesCommand.php rename to WebFiori/Framework/Cli/Commands/ListRoutesCommand.php diff --git a/webfiori - Copy/framework/cli/commands/ListThemesCommand.php b/WebFiori/Framework/Cli/Commands/ListThemesCommand.php similarity index 100% rename from webfiori - Copy/framework/cli/commands/ListThemesCommand.php rename to WebFiori/Framework/Cli/Commands/ListThemesCommand.php diff --git a/webfiori - Copy/framework/cli/commands/RunMigrationsCommand.php b/WebFiori/Framework/Cli/Commands/RunMigrationsCommand.php similarity index 100% rename from webfiori - Copy/framework/cli/commands/RunMigrationsCommand.php rename to WebFiori/Framework/Cli/Commands/RunMigrationsCommand.php diff --git a/webfiori - Copy/framework/cli/commands/RunSQLQueryCommand.php b/WebFiori/Framework/Cli/Commands/RunSQLQueryCommand.php similarity index 100% rename from webfiori - Copy/framework/cli/commands/RunSQLQueryCommand.php rename to WebFiori/Framework/Cli/Commands/RunSQLQueryCommand.php diff --git a/webfiori - Copy/framework/cli/commands/SchedulerCommand.php b/WebFiori/Framework/Cli/Commands/SchedulerCommand.php similarity index 100% rename from webfiori - Copy/framework/cli/commands/SchedulerCommand.php rename to WebFiori/Framework/Cli/Commands/SchedulerCommand.php diff --git a/webfiori - Copy/framework/cli/commands/SettingsCommand.php b/WebFiori/Framework/Cli/Commands/SettingsCommand.php similarity index 100% rename from webfiori - Copy/framework/cli/commands/SettingsCommand.php rename to WebFiori/Framework/Cli/Commands/SettingsCommand.php diff --git a/webfiori - Copy/framework/cli/commands/UpdateSettingsCommand.php b/WebFiori/Framework/Cli/Commands/UpdateSettingsCommand.php similarity index 100% rename from webfiori - Copy/framework/cli/commands/UpdateSettingsCommand.php rename to WebFiori/Framework/Cli/Commands/UpdateSettingsCommand.php diff --git a/webfiori - Copy/framework/cli/commands/UpdateTableCommand.php b/WebFiori/Framework/Cli/Commands/UpdateTableCommand.php similarity index 100% rename from webfiori - Copy/framework/cli/commands/UpdateTableCommand.php rename to WebFiori/Framework/Cli/Commands/UpdateTableCommand.php diff --git a/webfiori - Copy/framework/cli/commands/VersionCommand.php b/WebFiori/Framework/Cli/Commands/VersionCommand.php similarity index 100% rename from webfiori - Copy/framework/cli/commands/VersionCommand.php rename to WebFiori/Framework/Cli/Commands/VersionCommand.php diff --git a/webfiori - Copy/framework/cli/commands/WHelpCommand.php b/WebFiori/Framework/Cli/Commands/WHelpCommand.php similarity index 100% rename from webfiori - Copy/framework/cli/commands/WHelpCommand.php rename to WebFiori/Framework/Cli/Commands/WHelpCommand.php diff --git a/webfiori - Copy/framework/cli/helpers/ClassInfoReader.php b/WebFiori/Framework/Cli/Helpers/ClassInfoReader.php similarity index 100% rename from webfiori - Copy/framework/cli/helpers/ClassInfoReader.php rename to WebFiori/Framework/Cli/Helpers/ClassInfoReader.php diff --git a/webfiori - Copy/framework/cli/helpers/CreateAPITestCase.php b/WebFiori/Framework/Cli/Helpers/CreateAPITestCase.php similarity index 100% rename from webfiori - Copy/framework/cli/helpers/CreateAPITestCase.php rename to WebFiori/Framework/Cli/Helpers/CreateAPITestCase.php diff --git a/webfiori - Copy/framework/cli/helpers/CreateBackgroundTask.php b/WebFiori/Framework/Cli/Helpers/CreateBackgroundTask.php similarity index 100% rename from webfiori - Copy/framework/cli/helpers/CreateBackgroundTask.php rename to WebFiori/Framework/Cli/Helpers/CreateBackgroundTask.php diff --git a/webfiori - Copy/framework/cli/helpers/CreateCLIClassHelper.php b/WebFiori/Framework/Cli/Helpers/CreateCLIClassHelper.php similarity index 100% rename from webfiori - Copy/framework/cli/helpers/CreateCLIClassHelper.php rename to WebFiori/Framework/Cli/Helpers/CreateCLIClassHelper.php diff --git a/webfiori - Copy/framework/cli/helpers/CreateClassHelper.php b/WebFiori/Framework/Cli/Helpers/CreateClassHelper.php similarity index 100% rename from webfiori - Copy/framework/cli/helpers/CreateClassHelper.php rename to WebFiori/Framework/Cli/Helpers/CreateClassHelper.php diff --git a/webfiori - Copy/framework/cli/helpers/CreateDBAccessHelper.php b/WebFiori/Framework/Cli/Helpers/CreateDBAccessHelper.php similarity index 100% rename from webfiori - Copy/framework/cli/helpers/CreateDBAccessHelper.php rename to WebFiori/Framework/Cli/Helpers/CreateDBAccessHelper.php diff --git a/webfiori - Copy/framework/cli/helpers/CreateFullRESTHelper.php b/WebFiori/Framework/Cli/Helpers/CreateFullRESTHelper.php similarity index 100% rename from webfiori - Copy/framework/cli/helpers/CreateFullRESTHelper.php rename to WebFiori/Framework/Cli/Helpers/CreateFullRESTHelper.php diff --git a/webfiori - Copy/framework/cli/helpers/CreateMiddleware.php b/WebFiori/Framework/Cli/Helpers/CreateMiddleware.php similarity index 100% rename from webfiori - Copy/framework/cli/helpers/CreateMiddleware.php rename to WebFiori/Framework/Cli/Helpers/CreateMiddleware.php diff --git a/webfiori - Copy/framework/cli/helpers/CreateMigration.php b/WebFiori/Framework/Cli/Helpers/CreateMigration.php similarity index 100% rename from webfiori - Copy/framework/cli/helpers/CreateMigration.php rename to WebFiori/Framework/Cli/Helpers/CreateMigration.php diff --git a/webfiori - Copy/framework/cli/helpers/CreateTableObj.php b/WebFiori/Framework/Cli/Helpers/CreateTableObj.php similarity index 100% rename from webfiori - Copy/framework/cli/helpers/CreateTableObj.php rename to WebFiori/Framework/Cli/Helpers/CreateTableObj.php diff --git a/webfiori - Copy/framework/cli/helpers/CreateThemeHelper.php b/WebFiori/Framework/Cli/Helpers/CreateThemeHelper.php similarity index 100% rename from webfiori - Copy/framework/cli/helpers/CreateThemeHelper.php rename to WebFiori/Framework/Cli/Helpers/CreateThemeHelper.php diff --git a/webfiori - Copy/framework/cli/helpers/CreateWebService.php b/WebFiori/Framework/Cli/Helpers/CreateWebService.php similarity index 100% rename from webfiori - Copy/framework/cli/helpers/CreateWebService.php rename to WebFiori/Framework/Cli/Helpers/CreateWebService.php diff --git a/webfiori - Copy/framework/cli/helpers/TableObjHelper.php b/WebFiori/Framework/Cli/Helpers/TableObjHelper.php similarity index 100% rename from webfiori - Copy/framework/cli/helpers/TableObjHelper.php rename to WebFiori/Framework/Cli/Helpers/TableObjHelper.php diff --git a/webfiori - Copy/framework/config/ClassDriver.php b/WebFiori/Framework/Config/ClassDriver.php similarity index 100% rename from webfiori - Copy/framework/config/ClassDriver.php rename to WebFiori/Framework/Config/ClassDriver.php diff --git a/webfiori - Copy/framework/config/ConfigurationDriver.php b/WebFiori/Framework/Config/ConfigurationDriver.php similarity index 100% rename from webfiori - Copy/framework/config/ConfigurationDriver.php rename to WebFiori/Framework/Config/ConfigurationDriver.php diff --git a/webfiori - Copy/framework/config/Controller.php b/WebFiori/Framework/Config/Controller.php similarity index 100% rename from webfiori - Copy/framework/config/Controller.php rename to WebFiori/Framework/Config/Controller.php diff --git a/webfiori - Copy/framework/config/JsonDriver.php b/WebFiori/Framework/Config/JsonDriver.php similarity index 100% rename from webfiori - Copy/framework/config/JsonDriver.php rename to WebFiori/Framework/Config/JsonDriver.php diff --git a/webfiori - Copy/framework/DB.php b/WebFiori/Framework/DB.php similarity index 100% rename from webfiori - Copy/framework/DB.php rename to WebFiori/Framework/DB.php diff --git a/webfiori - Copy/framework/EmailMessage.php b/WebFiori/Framework/EmailMessage.php similarity index 100% rename from webfiori - Copy/framework/EmailMessage.php rename to WebFiori/Framework/EmailMessage.php diff --git a/webfiori - Copy/framework/exceptions/ArrayIndexOutOfBoundsException.php b/WebFiori/Framework/Exceptions/ArrayIndexOutOfBoundsException.php similarity index 100% rename from webfiori - Copy/framework/exceptions/ArrayIndexOutOfBoundsException.php rename to WebFiori/Framework/Exceptions/ArrayIndexOutOfBoundsException.php diff --git a/webfiori - Copy/framework/exceptions/InitializationException.php b/WebFiori/Framework/Exceptions/InitializationException.php similarity index 100% rename from webfiori - Copy/framework/exceptions/InitializationException.php rename to WebFiori/Framework/Exceptions/InitializationException.php diff --git a/webfiori - Copy/framework/exceptions/InvalidCRONExprException.php b/WebFiori/Framework/Exceptions/InvalidCRONExprException.php similarity index 100% rename from webfiori - Copy/framework/exceptions/InvalidCRONExprException.php rename to WebFiori/Framework/Exceptions/InvalidCRONExprException.php diff --git a/webfiori - Copy/framework/exceptions/MissingLangException.php b/WebFiori/Framework/Exceptions/MissingLangException.php similarity index 100% rename from webfiori - Copy/framework/exceptions/MissingLangException.php rename to WebFiori/Framework/Exceptions/MissingLangException.php diff --git a/webfiori - Copy/framework/exceptions/NoSuchThemeException.php b/WebFiori/Framework/Exceptions/NoSuchThemeException.php similarity index 100% rename from webfiori - Copy/framework/exceptions/NoSuchThemeException.php rename to WebFiori/Framework/Exceptions/NoSuchThemeException.php diff --git a/webfiori - Copy/framework/exceptions/RoutingException.php b/WebFiori/Framework/Exceptions/RoutingException.php similarity index 100% rename from webfiori - Copy/framework/exceptions/RoutingException.php rename to WebFiori/Framework/Exceptions/RoutingException.php diff --git a/webfiori - Copy/framework/exceptions/SessionException.php b/WebFiori/Framework/Exceptions/SessionException.php similarity index 100% rename from webfiori - Copy/framework/exceptions/SessionException.php rename to WebFiori/Framework/Exceptions/SessionException.php diff --git a/webfiori - Copy/framework/exceptions/UIException.php b/WebFiori/Framework/Exceptions/UIException.php similarity index 100% rename from webfiori - Copy/framework/exceptions/UIException.php rename to WebFiori/Framework/Exceptions/UIException.php diff --git a/webfiori - Copy/framework/ExtendedWebServicesManager.php b/WebFiori/Framework/ExtendedWebServicesManager.php similarity index 100% rename from webfiori - Copy/framework/ExtendedWebServicesManager.php rename to WebFiori/Framework/ExtendedWebServicesManager.php diff --git a/webfiori - Copy/framework/handlers/APICallErrHandler.php b/WebFiori/Framework/Handlers/APICallErrHandler.php similarity index 100% rename from webfiori - Copy/framework/handlers/APICallErrHandler.php rename to WebFiori/Framework/Handlers/APICallErrHandler.php diff --git a/webfiori - Copy/framework/handlers/CLIErrHandler.php b/WebFiori/Framework/Handlers/CLIErrHandler.php similarity index 100% rename from webfiori - Copy/framework/handlers/CLIErrHandler.php rename to WebFiori/Framework/Handlers/CLIErrHandler.php diff --git a/webfiori - Copy/framework/handlers/HTTPErrHandler.php b/WebFiori/Framework/Handlers/HTTPErrHandler.php similarity index 100% rename from webfiori - Copy/framework/handlers/HTTPErrHandler.php rename to WebFiori/Framework/Handlers/HTTPErrHandler.php diff --git a/webfiori - Copy/framework/Ini.php b/WebFiori/Framework/Ini.php similarity index 100% rename from webfiori - Copy/framework/Ini.php rename to WebFiori/Framework/Ini.php diff --git a/webfiori - Copy/framework/Lang.php b/WebFiori/Framework/Lang.php similarity index 100% rename from webfiori - Copy/framework/Lang.php rename to WebFiori/Framework/Lang.php diff --git a/webfiori - Copy/framework/middleware/AbstractMiddleware.php b/WebFiori/Framework/Middleware/AbstractMiddleware.php similarity index 100% rename from webfiori - Copy/framework/middleware/AbstractMiddleware.php rename to WebFiori/Framework/Middleware/AbstractMiddleware.php diff --git a/webfiori - Copy/framework/middleware/CacheMiddleware.php b/WebFiori/Framework/Middleware/CacheMiddleware.php similarity index 100% rename from webfiori - Copy/framework/middleware/CacheMiddleware.php rename to WebFiori/Framework/Middleware/CacheMiddleware.php diff --git a/webfiori - Copy/framework/middleware/MiddlewareManager.php b/WebFiori/Framework/Middleware/MiddlewareManager.php similarity index 100% rename from webfiori - Copy/framework/middleware/MiddlewareManager.php rename to WebFiori/Framework/Middleware/MiddlewareManager.php diff --git a/webfiori - Copy/framework/middleware/StartSessionMiddleware.php b/WebFiori/Framework/Middleware/StartSessionMiddleware.php similarity index 100% rename from webfiori - Copy/framework/middleware/StartSessionMiddleware.php rename to WebFiori/Framework/Middleware/StartSessionMiddleware.php diff --git a/webfiori - Copy/framework/Privilege.php b/WebFiori/Framework/Privilege.php similarity index 100% rename from webfiori - Copy/framework/Privilege.php rename to WebFiori/Framework/Privilege.php diff --git a/webfiori - Copy/framework/PrivilegesGroup.php b/WebFiori/Framework/PrivilegesGroup.php similarity index 100% rename from webfiori - Copy/framework/PrivilegesGroup.php rename to WebFiori/Framework/PrivilegesGroup.php diff --git a/webfiori - Copy/framework/router/RouteOption.php b/WebFiori/Framework/Router/RouteOption.php similarity index 100% rename from webfiori - Copy/framework/router/RouteOption.php rename to WebFiori/Framework/Router/RouteOption.php diff --git a/webfiori - Copy/framework/router/Router.php b/WebFiori/Framework/Router/Router.php similarity index 100% rename from webfiori - Copy/framework/router/Router.php rename to WebFiori/Framework/Router/Router.php diff --git a/webfiori - Copy/framework/router/RouterUri.php b/WebFiori/Framework/Router/RouterUri.php similarity index 100% rename from webfiori - Copy/framework/router/RouterUri.php rename to WebFiori/Framework/Router/RouterUri.php diff --git a/webfiori - Copy/framework/scheduler/AbstractTask.php b/WebFiori/Framework/Scheduler/AbstractTask.php similarity index 100% rename from webfiori - Copy/framework/scheduler/AbstractTask.php rename to WebFiori/Framework/Scheduler/AbstractTask.php diff --git a/webfiori - Copy/framework/scheduler/BaseTask.php b/WebFiori/Framework/Scheduler/BaseTask.php similarity index 100% rename from webfiori - Copy/framework/scheduler/BaseTask.php rename to WebFiori/Framework/Scheduler/BaseTask.php diff --git a/webfiori - Copy/framework/scheduler/TaskArgument.php b/WebFiori/Framework/Scheduler/TaskArgument.php similarity index 100% rename from webfiori - Copy/framework/scheduler/TaskArgument.php rename to WebFiori/Framework/Scheduler/TaskArgument.php diff --git a/webfiori - Copy/framework/scheduler/TaskStatusEmail.php b/WebFiori/Framework/Scheduler/TaskStatusEmail.php similarity index 100% rename from webfiori - Copy/framework/scheduler/TaskStatusEmail.php rename to WebFiori/Framework/Scheduler/TaskStatusEmail.php diff --git a/webfiori - Copy/framework/scheduler/TasksManager.php b/WebFiori/Framework/Scheduler/TasksManager.php similarity index 100% rename from webfiori - Copy/framework/scheduler/TasksManager.php rename to WebFiori/Framework/Scheduler/TasksManager.php diff --git a/webfiori - Copy/framework/scheduler/webServices/ForceTaskExecutionService.php b/WebFiori/Framework/Scheduler/WebServices/ForceTaskExecutionService.php similarity index 100% rename from webfiori - Copy/framework/scheduler/webServices/ForceTaskExecutionService.php rename to WebFiori/Framework/Scheduler/WebServices/ForceTaskExecutionService.php diff --git a/webfiori - Copy/framework/scheduler/webServices/GetTasksService.php b/WebFiori/Framework/Scheduler/WebServices/GetTasksService.php similarity index 100% rename from webfiori - Copy/framework/scheduler/webServices/GetTasksService.php rename to WebFiori/Framework/Scheduler/WebServices/GetTasksService.php diff --git a/webfiori - Copy/framework/scheduler/webServices/PrivateSchedulerService.php b/WebFiori/Framework/Scheduler/WebServices/PrivateSchedulerService.php similarity index 100% rename from webfiori - Copy/framework/scheduler/webServices/PrivateSchedulerService.php rename to WebFiori/Framework/Scheduler/WebServices/PrivateSchedulerService.php diff --git a/webfiori - Copy/framework/scheduler/webServices/SetupPasswordService.php b/WebFiori/Framework/Scheduler/WebServices/SetupPasswordService.php similarity index 100% rename from webfiori - Copy/framework/scheduler/webServices/SetupPasswordService.php rename to WebFiori/Framework/Scheduler/WebServices/SetupPasswordService.php diff --git a/webfiori - Copy/framework/scheduler/webServices/TasksLoginService.php b/WebFiori/Framework/Scheduler/WebServices/TasksLoginService.php similarity index 100% rename from webfiori - Copy/framework/scheduler/webServices/TasksLoginService.php rename to WebFiori/Framework/Scheduler/WebServices/TasksLoginService.php diff --git a/webfiori - Copy/framework/scheduler/webServices/TasksLogoutService.php b/WebFiori/Framework/Scheduler/WebServices/TasksLogoutService.php similarity index 100% rename from webfiori - Copy/framework/scheduler/webServices/TasksLogoutService.php rename to WebFiori/Framework/Scheduler/WebServices/TasksLogoutService.php diff --git a/webfiori - Copy/framework/scheduler/webServices/TasksServicesManager.php b/WebFiori/Framework/Scheduler/WebServices/TasksServicesManager.php similarity index 100% rename from webfiori - Copy/framework/scheduler/webServices/TasksServicesManager.php rename to WebFiori/Framework/Scheduler/WebServices/TasksServicesManager.php diff --git a/webfiori - Copy/framework/scheduler/webUI/BaseTasksPage.php b/WebFiori/Framework/Scheduler/WebUI/BaseTasksPage.php similarity index 100% rename from webfiori - Copy/framework/scheduler/webUI/BaseTasksPage.php rename to WebFiori/Framework/Scheduler/WebUI/BaseTasksPage.php diff --git a/webfiori - Copy/framework/scheduler/webUI/ListTasksPage.php b/WebFiori/Framework/Scheduler/WebUI/ListTasksPage.php similarity index 100% rename from webfiori - Copy/framework/scheduler/webUI/ListTasksPage.php rename to WebFiori/Framework/Scheduler/WebUI/ListTasksPage.php diff --git a/webfiori - Copy/framework/scheduler/webUI/SetPasswordPage.php b/WebFiori/Framework/Scheduler/WebUI/SetPasswordPage.php similarity index 100% rename from webfiori - Copy/framework/scheduler/webUI/SetPasswordPage.php rename to WebFiori/Framework/Scheduler/WebUI/SetPasswordPage.php diff --git a/webfiori - Copy/framework/scheduler/webUI/TasksLoginPage.php b/WebFiori/Framework/Scheduler/WebUI/TasksLoginPage.php similarity index 100% rename from webfiori - Copy/framework/scheduler/webUI/TasksLoginPage.php rename to WebFiori/Framework/Scheduler/WebUI/TasksLoginPage.php diff --git a/webfiori - Copy/framework/scheduler/webUI/TasksTable.php b/WebFiori/Framework/Scheduler/WebUI/TasksTable.php similarity index 100% rename from webfiori - Copy/framework/scheduler/webUI/TasksTable.php rename to WebFiori/Framework/Scheduler/WebUI/TasksTable.php diff --git a/webfiori - Copy/framework/scheduler/webUI/templates/job-execution-status-dialog.html b/WebFiori/Framework/Scheduler/WebUI/templates/job-execution-status-dialog.html similarity index 100% rename from webfiori - Copy/framework/scheduler/webUI/templates/job-execution-status-dialog.html rename to WebFiori/Framework/Scheduler/WebUI/templates/job-execution-status-dialog.html diff --git a/webfiori - Copy/framework/scheduler/webUI/templates/job-output-dialog.html b/WebFiori/Framework/Scheduler/WebUI/templates/job-output-dialog.html similarity index 100% rename from webfiori - Copy/framework/scheduler/webUI/templates/job-output-dialog.html rename to WebFiori/Framework/Scheduler/WebUI/templates/job-output-dialog.html diff --git a/webfiori - Copy/framework/scheduler/webUI/templates/login-form.html b/WebFiori/Framework/Scheduler/WebUI/templates/login-form.html similarity index 100% rename from webfiori - Copy/framework/scheduler/webUI/templates/login-form.html rename to WebFiori/Framework/Scheduler/WebUI/templates/login-form.html diff --git a/webfiori - Copy/framework/scheduler/webUI/templates/message-dialog.html b/WebFiori/Framework/Scheduler/WebUI/templates/message-dialog.html similarity index 100% rename from webfiori - Copy/framework/scheduler/webUI/templates/message-dialog.html rename to WebFiori/Framework/Scheduler/WebUI/templates/message-dialog.html diff --git a/webfiori - Copy/framework/scheduler/webUI/templates/scheduler-head.php b/WebFiori/Framework/Scheduler/WebUI/templates/scheduler-head.php similarity index 100% rename from webfiori - Copy/framework/scheduler/webUI/templates/scheduler-head.php rename to WebFiori/Framework/Scheduler/WebUI/templates/scheduler-head.php diff --git a/webfiori - Copy/framework/scheduler/webUI/templates/set-password-form.html b/WebFiori/Framework/Scheduler/WebUI/templates/set-password-form.html similarity index 100% rename from webfiori - Copy/framework/scheduler/webUI/templates/set-password-form.html rename to WebFiori/Framework/Scheduler/WebUI/templates/set-password-form.html diff --git a/webfiori - Copy/framework/scheduler/webUI/templates/tasks-table.html b/WebFiori/Framework/Scheduler/WebUI/templates/tasks-table.html similarity index 100% rename from webfiori - Copy/framework/scheduler/webUI/templates/tasks-table.html rename to WebFiori/Framework/Scheduler/WebUI/templates/tasks-table.html diff --git a/webfiori - Copy/framework/session/DatabaseSessionStorage.php b/WebFiori/Framework/Session/DatabaseSessionStorage.php similarity index 100% rename from webfiori - Copy/framework/session/DatabaseSessionStorage.php rename to WebFiori/Framework/Session/DatabaseSessionStorage.php diff --git a/webfiori - Copy/framework/session/DefaultSessionStorage.php b/WebFiori/Framework/Session/DefaultSessionStorage.php similarity index 100% rename from webfiori - Copy/framework/session/DefaultSessionStorage.php rename to WebFiori/Framework/Session/DefaultSessionStorage.php diff --git a/webfiori - Copy/framework/session/MSSQLSessionDataTable.php b/WebFiori/Framework/Session/MSSQLSessionDataTable.php similarity index 100% rename from webfiori - Copy/framework/session/MSSQLSessionDataTable.php rename to WebFiori/Framework/Session/MSSQLSessionDataTable.php diff --git a/webfiori - Copy/framework/session/MSSQLSessionsTable.php b/WebFiori/Framework/Session/MSSQLSessionsTable.php similarity index 100% rename from webfiori - Copy/framework/session/MSSQLSessionsTable.php rename to WebFiori/Framework/Session/MSSQLSessionsTable.php diff --git a/webfiori - Copy/framework/session/MySQLSessionDataTable.php b/WebFiori/Framework/Session/MySQLSessionDataTable.php similarity index 100% rename from webfiori - Copy/framework/session/MySQLSessionDataTable.php rename to WebFiori/Framework/Session/MySQLSessionDataTable.php diff --git a/webfiori - Copy/framework/session/MySQLSessionsTable.php b/WebFiori/Framework/Session/MySQLSessionsTable.php similarity index 100% rename from webfiori - Copy/framework/session/MySQLSessionsTable.php rename to WebFiori/Framework/Session/MySQLSessionsTable.php diff --git a/webfiori - Copy/framework/session/Session.php b/WebFiori/Framework/Session/Session.php similarity index 100% rename from webfiori - Copy/framework/session/Session.php rename to WebFiori/Framework/Session/Session.php diff --git a/webfiori - Copy/framework/session/SessionDB.php b/WebFiori/Framework/Session/SessionDB.php similarity index 100% rename from webfiori - Copy/framework/session/SessionDB.php rename to WebFiori/Framework/Session/SessionDB.php diff --git a/webfiori - Copy/framework/session/SessionOption.php b/WebFiori/Framework/Session/SessionOption.php similarity index 100% rename from webfiori - Copy/framework/session/SessionOption.php rename to WebFiori/Framework/Session/SessionOption.php diff --git a/webfiori - Copy/framework/session/SessionStatus.php b/WebFiori/Framework/Session/SessionStatus.php similarity index 100% rename from webfiori - Copy/framework/session/SessionStatus.php rename to WebFiori/Framework/Session/SessionStatus.php diff --git a/webfiori - Copy/framework/session/SessionStorage.php b/WebFiori/Framework/Session/SessionStorage.php similarity index 100% rename from webfiori - Copy/framework/session/SessionStorage.php rename to WebFiori/Framework/Session/SessionStorage.php diff --git a/webfiori - Copy/framework/session/SessionUser.php b/WebFiori/Framework/Session/SessionUser.php similarity index 100% rename from webfiori - Copy/framework/session/SessionUser.php rename to WebFiori/Framework/Session/SessionUser.php diff --git a/webfiori - Copy/framework/session/SessionsManager.php b/WebFiori/Framework/Session/SessionsManager.php similarity index 100% rename from webfiori - Copy/framework/session/SessionsManager.php rename to WebFiori/Framework/Session/SessionsManager.php diff --git a/webfiori - Copy/framework/Theme.php b/WebFiori/Framework/Theme.php similarity index 100% rename from webfiori - Copy/framework/Theme.php rename to WebFiori/Framework/Theme.php diff --git a/webfiori - Copy/framework/ThemeManager.php b/WebFiori/Framework/ThemeManager.php similarity index 100% rename from webfiori - Copy/framework/ThemeManager.php rename to WebFiori/Framework/ThemeManager.php diff --git a/webfiori - Copy/framework/ui/BeforeRenderCallback.php b/WebFiori/Framework/Ui/BeforeRenderCallback.php similarity index 100% rename from webfiori - Copy/framework/ui/BeforeRenderCallback.php rename to WebFiori/Framework/Ui/BeforeRenderCallback.php diff --git a/webfiori - Copy/framework/ui/HTTPCodeView.php b/WebFiori/Framework/Ui/HTTPCodeView.php similarity index 100% rename from webfiori - Copy/framework/ui/HTTPCodeView.php rename to WebFiori/Framework/Ui/HTTPCodeView.php diff --git a/webfiori - Copy/framework/ui/MessageBox.php b/WebFiori/Framework/Ui/MessageBox.php similarity index 100% rename from webfiori - Copy/framework/ui/MessageBox.php rename to WebFiori/Framework/Ui/MessageBox.php diff --git a/webfiori - Copy/framework/ui/serverErrPage/ServerErrPage.php b/WebFiori/Framework/Ui/ServerErrPage/ServerErrPage.php similarity index 100% rename from webfiori - Copy/framework/ui/serverErrPage/ServerErrPage.php rename to WebFiori/Framework/Ui/ServerErrPage/ServerErrPage.php diff --git a/webfiori - Copy/framework/ui/serverErrPage/error-details.php b/WebFiori/Framework/Ui/ServerErrPage/error-details.php similarity index 100% rename from webfiori - Copy/framework/ui/serverErrPage/error-details.php rename to WebFiori/Framework/Ui/ServerErrPage/error-details.php diff --git a/webfiori - Copy/framework/ui/serverErrPage/server-err-head.php b/WebFiori/Framework/Ui/ServerErrPage/server-err-head.php similarity index 100% rename from webfiori - Copy/framework/ui/serverErrPage/server-err-head.php rename to WebFiori/Framework/Ui/ServerErrPage/server-err-head.php diff --git a/webfiori - Copy/framework/ui/serverErrPage/server-err-header.php b/WebFiori/Framework/Ui/ServerErrPage/server-err-header.php similarity index 100% rename from webfiori - Copy/framework/ui/serverErrPage/server-err-header.php rename to WebFiori/Framework/Ui/ServerErrPage/server-err-header.php diff --git a/webfiori - Copy/framework/ui/serverErrPage/server-err-stack-trace.php b/WebFiori/Framework/Ui/ServerErrPage/server-err-stack-trace.php similarity index 100% rename from webfiori - Copy/framework/ui/serverErrPage/server-err-stack-trace.php rename to WebFiori/Framework/Ui/ServerErrPage/server-err-stack-trace.php diff --git a/webfiori - Copy/framework/ui/StarterPage.php b/WebFiori/Framework/Ui/StarterPage.php similarity index 100% rename from webfiori - Copy/framework/ui/StarterPage.php rename to WebFiori/Framework/Ui/StarterPage.php diff --git a/webfiori - Copy/framework/ui/WebPage.php b/WebFiori/Framework/Ui/WebPage.php similarity index 100% rename from webfiori - Copy/framework/ui/WebPage.php rename to WebFiori/Framework/Ui/WebPage.php diff --git a/webfiori - Copy/framework/ui/ui-functions.php b/WebFiori/Framework/Ui/ui-functions.php similarity index 100% rename from webfiori - Copy/framework/ui/ui-functions.php rename to WebFiori/Framework/Ui/ui-functions.php diff --git a/webfiori - Copy/framework/User.php b/WebFiori/Framework/User.php similarity index 100% rename from webfiori - Copy/framework/User.php rename to WebFiori/Framework/User.php diff --git a/webfiori - Copy/framework/Util.php b/WebFiori/Framework/Util.php similarity index 100% rename from webfiori - Copy/framework/Util.php rename to WebFiori/Framework/Util.php diff --git a/webfiori - Copy/framework/writers/APITestCaseWriter.php b/WebFiori/Framework/Writers/APITestCaseWriter.php similarity index 100% rename from webfiori - Copy/framework/writers/APITestCaseWriter.php rename to WebFiori/Framework/Writers/APITestCaseWriter.php diff --git a/webfiori - Copy/framework/writers/ClassWriter.php b/WebFiori/Framework/Writers/ClassWriter.php similarity index 100% rename from webfiori - Copy/framework/writers/ClassWriter.php rename to WebFiori/Framework/Writers/ClassWriter.php diff --git a/webfiori - Copy/framework/writers/CommandClassWriter.php b/WebFiori/Framework/Writers/CommandClassWriter.php similarity index 100% rename from webfiori - Copy/framework/writers/CommandClassWriter.php rename to WebFiori/Framework/Writers/CommandClassWriter.php diff --git a/webfiori - Copy/framework/writers/DBClassWriter.php b/WebFiori/Framework/Writers/DBClassWriter.php similarity index 100% rename from webfiori - Copy/framework/writers/DBClassWriter.php rename to WebFiori/Framework/Writers/DBClassWriter.php diff --git a/webfiori - Copy/framework/writers/DatabaseMigrationWriter.php b/WebFiori/Framework/Writers/DatabaseMigrationWriter.php similarity index 100% rename from webfiori - Copy/framework/writers/DatabaseMigrationWriter.php rename to WebFiori/Framework/Writers/DatabaseMigrationWriter.php diff --git a/webfiori - Copy/framework/writers/LangClassWriter.php b/WebFiori/Framework/Writers/LangClassWriter.php similarity index 100% rename from webfiori - Copy/framework/writers/LangClassWriter.php rename to WebFiori/Framework/Writers/LangClassWriter.php diff --git a/webfiori - Copy/framework/writers/MiddlewareClassWriter.php b/WebFiori/Framework/Writers/MiddlewareClassWriter.php similarity index 100% rename from webfiori - Copy/framework/writers/MiddlewareClassWriter.php rename to WebFiori/Framework/Writers/MiddlewareClassWriter.php diff --git a/webfiori - Copy/framework/writers/SchedulerTaskClassWriter.php b/WebFiori/Framework/Writers/SchedulerTaskClassWriter.php similarity index 100% rename from webfiori - Copy/framework/writers/SchedulerTaskClassWriter.php rename to WebFiori/Framework/Writers/SchedulerTaskClassWriter.php diff --git a/webfiori - Copy/framework/writers/ServiceHolder.php b/WebFiori/Framework/Writers/ServiceHolder.php similarity index 100% rename from webfiori - Copy/framework/writers/ServiceHolder.php rename to WebFiori/Framework/Writers/ServiceHolder.php diff --git a/webfiori - Copy/framework/writers/TableClassWriter.php b/WebFiori/Framework/Writers/TableClassWriter.php similarity index 100% rename from webfiori - Copy/framework/writers/TableClassWriter.php rename to WebFiori/Framework/Writers/TableClassWriter.php diff --git a/webfiori - Copy/framework/writers/ThemeClassWriter.php b/WebFiori/Framework/Writers/ThemeClassWriter.php similarity index 100% rename from webfiori - Copy/framework/writers/ThemeClassWriter.php rename to WebFiori/Framework/Writers/ThemeClassWriter.php diff --git a/webfiori - Copy/framework/writers/ThemeComponentWriter.php b/WebFiori/Framework/Writers/ThemeComponentWriter.php similarity index 100% rename from webfiori - Copy/framework/writers/ThemeComponentWriter.php rename to WebFiori/Framework/Writers/ThemeComponentWriter.php diff --git a/webfiori - Copy/framework/writers/WebServiceWriter.php b/WebFiori/Framework/Writers/WebServiceWriter.php similarity index 100% rename from webfiori - Copy/framework/writers/WebServiceWriter.php rename to WebFiori/Framework/Writers/WebServiceWriter.php diff --git a/app/tasks/temp b/app/tasks/temp deleted file mode 100644 index 8b1378917..000000000 --- a/app/tasks/temp +++ /dev/null @@ -1 +0,0 @@ - diff --git a/app/themes/cool/temp b/app/themes/cool/temp deleted file mode 100644 index 8b1378917..000000000 --- a/app/themes/cool/temp +++ /dev/null @@ -1 +0,0 @@ - diff --git a/app/apis/.gitkeep b/appp/apis/.gitkeep similarity index 100% rename from app/apis/.gitkeep rename to appp/apis/.gitkeep diff --git a/app/apis/RoutingTestClass.php b/appp/apis/RoutingTestClass.php similarity index 100% rename from app/apis/RoutingTestClass.php rename to appp/apis/RoutingTestClass.php diff --git a/app/apis/super/temp b/appp/apis/super/temp similarity index 100% rename from app/apis/super/temp rename to appp/apis/super/temp diff --git a/app/commands/.gitkeep b/appp/commands/.gitkeep similarity index 100% rename from app/commands/.gitkeep rename to appp/commands/.gitkeep diff --git a/app/config/config-with-err-00.json b/appp/config/config-with-err-00.json similarity index 100% rename from app/config/config-with-err-00.json rename to appp/config/config-with-err-00.json diff --git a/app/database/Test2Table.php b/appp/database/Test2Table.php similarity index 100% rename from app/database/Test2Table.php rename to appp/database/Test2Table.php diff --git a/app/database/TestTable.php b/appp/database/TestTable.php similarity index 100% rename from app/database/TestTable.php rename to appp/database/TestTable.php diff --git a/app/database/empl/temp b/appp/database/empl/temp similarity index 100% rename from app/database/empl/temp rename to appp/database/empl/temp diff --git a/app/database/migrations/.gitkeep b/appp/database/migrations/.gitkeep similarity index 100% rename from app/database/migrations/.gitkeep rename to appp/database/migrations/.gitkeep diff --git a/app/database/migrations/commands/.gitkeep b/appp/database/migrations/commands/.gitkeep similarity index 100% rename from app/database/migrations/commands/.gitkeep rename to appp/database/migrations/commands/.gitkeep diff --git a/app/database/migrations/emptyRunner/XRunner.php b/appp/database/migrations/emptyRunner/XRunner.php similarity index 100% rename from app/database/migrations/emptyRunner/XRunner.php rename to appp/database/migrations/emptyRunner/XRunner.php diff --git a/app/database/migrations/multi/Migration000.php b/appp/database/migrations/multi/Migration000.php similarity index 100% rename from app/database/migrations/multi/Migration000.php rename to appp/database/migrations/multi/Migration000.php diff --git a/app/database/migrations/multi/Migration001.php b/appp/database/migrations/multi/Migration001.php similarity index 100% rename from app/database/migrations/multi/Migration001.php rename to appp/database/migrations/multi/Migration001.php diff --git a/app/database/migrations/multi/Migration002.php b/appp/database/migrations/multi/Migration002.php similarity index 100% rename from app/database/migrations/multi/Migration002.php rename to appp/database/migrations/multi/Migration002.php diff --git a/app/database/migrations/multi/MultiRunner.php b/appp/database/migrations/multi/MultiRunner.php similarity index 100% rename from app/database/migrations/multi/MultiRunner.php rename to appp/database/migrations/multi/MultiRunner.php diff --git a/app/database/migrations/multiDownErr/Migration000.php b/appp/database/migrations/multiDownErr/Migration000.php similarity index 100% rename from app/database/migrations/multiDownErr/Migration000.php rename to appp/database/migrations/multiDownErr/Migration000.php diff --git a/app/database/migrations/multiDownErr/Migration001.php b/appp/database/migrations/multiDownErr/Migration001.php similarity index 100% rename from app/database/migrations/multiDownErr/Migration001.php rename to appp/database/migrations/multiDownErr/Migration001.php diff --git a/app/database/migrations/multiDownErr/Migration002.php b/appp/database/migrations/multiDownErr/Migration002.php similarity index 100% rename from app/database/migrations/multiDownErr/Migration002.php rename to appp/database/migrations/multiDownErr/Migration002.php diff --git a/app/database/migrations/multiDownErr/MultiErrRunner.php b/appp/database/migrations/multiDownErr/MultiErrRunner.php similarity index 100% rename from app/database/migrations/multiDownErr/MultiErrRunner.php rename to appp/database/migrations/multiDownErr/MultiErrRunner.php diff --git a/app/database/migrations/multiErr/Migration000.php b/appp/database/migrations/multiErr/Migration000.php similarity index 100% rename from app/database/migrations/multiErr/Migration000.php rename to appp/database/migrations/multiErr/Migration000.php diff --git a/app/database/migrations/multiErr/Migration001.php b/appp/database/migrations/multiErr/Migration001.php similarity index 100% rename from app/database/migrations/multiErr/Migration001.php rename to appp/database/migrations/multiErr/Migration001.php diff --git a/app/database/migrations/multiErr/Migration002.php b/appp/database/migrations/multiErr/Migration002.php similarity index 100% rename from app/database/migrations/multiErr/Migration002.php rename to appp/database/migrations/multiErr/Migration002.php diff --git a/app/database/migrations/multiErr/MultiErrRunner.php b/appp/database/migrations/multiErr/MultiErrRunner.php similarity index 100% rename from app/database/migrations/multiErr/MultiErrRunner.php rename to appp/database/migrations/multiErr/MultiErrRunner.php diff --git a/app/database/migrations/noConn/Migration000.php b/appp/database/migrations/noConn/Migration000.php similarity index 100% rename from app/database/migrations/noConn/Migration000.php rename to appp/database/migrations/noConn/Migration000.php diff --git a/app/database/migrations/noConn/XRunner.php b/appp/database/migrations/noConn/XRunner.php similarity index 100% rename from app/database/migrations/noConn/XRunner.php rename to appp/database/migrations/noConn/XRunner.php diff --git a/app/database/sql-file.sql b/appp/database/sql-file.sql similarity index 100% rename from app/database/sql-file.sql rename to appp/database/sql-file.sql diff --git a/app/database/super/temp b/appp/database/super/temp similarity index 100% rename from app/database/super/temp rename to appp/database/super/temp diff --git a/app/entity/WithException.php b/appp/entity/WithException.php similarity index 100% rename from app/entity/WithException.php rename to appp/entity/WithException.php diff --git a/app/ini/InitAutoLoad.php b/appp/ini/InitAutoLoad.php similarity index 100% rename from app/ini/InitAutoLoad.php rename to appp/ini/InitAutoLoad.php diff --git a/app/ini/InitCliCommands.php b/appp/ini/InitCliCommands.php similarity index 100% rename from app/ini/InitCliCommands.php rename to appp/ini/InitCliCommands.php diff --git a/app/ini/InitCommands.php b/appp/ini/InitCommands.php similarity index 100% rename from app/ini/InitCommands.php rename to appp/ini/InitCommands.php diff --git a/app/ini/InitMiddleware.php b/appp/ini/InitMiddleware.php similarity index 100% rename from app/ini/InitMiddleware.php rename to appp/ini/InitMiddleware.php diff --git a/app/ini/InitPrivileges.php b/appp/ini/InitPrivileges.php similarity index 100% rename from app/ini/InitPrivileges.php rename to appp/ini/InitPrivileges.php diff --git a/app/ini/InitTasks.php b/appp/ini/InitTasks.php similarity index 100% rename from app/ini/InitTasks.php rename to appp/ini/InitTasks.php diff --git a/app/ini/routes/APIsRoutes.php b/appp/ini/routes/APIsRoutes.php similarity index 100% rename from app/ini/routes/APIsRoutes.php rename to appp/ini/routes/APIsRoutes.php diff --git a/app/ini/routes/ClosureRoutes.php b/appp/ini/routes/ClosureRoutes.php similarity index 100% rename from app/ini/routes/ClosureRoutes.php rename to appp/ini/routes/ClosureRoutes.php diff --git a/app/ini/routes/OtherRoutes.php b/appp/ini/routes/OtherRoutes.php similarity index 100% rename from app/ini/routes/OtherRoutes.php rename to appp/ini/routes/OtherRoutes.php diff --git a/app/ini/routes/PagesRoutes.php b/appp/ini/routes/PagesRoutes.php similarity index 100% rename from app/ini/routes/PagesRoutes.php rename to appp/ini/routes/PagesRoutes.php diff --git a/app/langs/LangAR.php b/appp/langs/LangAR.php similarity index 100% rename from app/langs/LangAR.php rename to appp/langs/LangAR.php diff --git a/app/langs/LangEN.php b/appp/langs/LangEN.php similarity index 100% rename from app/langs/LangEN.php rename to appp/langs/LangEN.php diff --git a/app/langs/LangFR.php b/appp/langs/LangFR.php similarity index 100% rename from app/langs/LangFR.php rename to appp/langs/LangFR.php diff --git a/app/langs/LangGB.php b/appp/langs/LangGB.php similarity index 100% rename from app/langs/LangGB.php rename to appp/langs/LangGB.php diff --git a/app/langs/LangJP.php b/appp/langs/LangJP.php similarity index 100% rename from app/langs/LangJP.php rename to appp/langs/LangJP.php diff --git a/app/middleware/CoolMiddleware.php b/appp/middleware/CoolMiddleware.php similarity index 100% rename from app/middleware/CoolMiddleware.php rename to appp/middleware/CoolMiddleware.php diff --git a/app/entity/super/temp b/appp/middleware/temp similarity index 100% rename from app/entity/super/temp rename to appp/middleware/temp diff --git a/app/tasks/Fail1TestTask.php b/appp/tasks/Fail1TestTask.php similarity index 100% rename from app/tasks/Fail1TestTask.php rename to appp/tasks/Fail1TestTask.php diff --git a/app/tasks/Fail2TestTask.php b/appp/tasks/Fail2TestTask.php similarity index 100% rename from app/tasks/Fail2TestTask.php rename to appp/tasks/Fail2TestTask.php diff --git a/app/tasks/Fail3TestTask.php b/appp/tasks/Fail3TestTask.php similarity index 100% rename from app/tasks/Fail3TestTask.php rename to appp/tasks/Fail3TestTask.php diff --git a/app/tasks/SuccessTestEveryMinute.php b/appp/tasks/SuccessTestEveryMinute.php similarity index 100% rename from app/tasks/SuccessTestEveryMinute.php rename to appp/tasks/SuccessTestEveryMinute.php diff --git a/app/tasks/SuccessTestTask.php b/appp/tasks/SuccessTestTask.php similarity index 100% rename from app/tasks/SuccessTestTask.php rename to appp/tasks/SuccessTestTask.php diff --git a/app/entity/temp b/appp/tasks/temp similarity index 100% rename from app/entity/temp rename to appp/tasks/temp diff --git a/app/middleware/temp b/appp/themes/cool/temp similarity index 100% rename from app/middleware/temp rename to appp/themes/cool/temp diff --git a/tests/apis/emptyService/EmptyServicesManager.php b/tests/Apiss/EmptyService/EmptyServicesManager.php similarity index 100% rename from tests/apis/emptyService/EmptyServicesManager.php rename to tests/Apiss/EmptyService/EmptyServicesManager.php diff --git a/tests/apis/multiple/ServicesManager00.php b/tests/Apiss/Multiple/ServicesManager00.php similarity index 100% rename from tests/apis/multiple/ServicesManager00.php rename to tests/Apiss/Multiple/ServicesManager00.php diff --git a/tests/apis/multiple/WebService00.php b/tests/Apiss/Multiple/WebService00.php similarity index 100% rename from tests/apis/multiple/WebService00.php rename to tests/Apiss/Multiple/WebService00.php diff --git a/tests/apis/multiple/WebService01.php b/tests/Apiss/Multiple/WebService01.php similarity index 100% rename from tests/apis/multiple/WebService01.php rename to tests/Apiss/Multiple/WebService01.php diff --git a/tests/tables/EmployeeInfoTable.php b/tests/Tabless/EmployeeInfoTable.php similarity index 100% rename from tests/tables/EmployeeInfoTable.php rename to tests/Tabless/EmployeeInfoTable.php diff --git a/tests/tables/PositionInfoTable.php b/tests/Tabless/PositionInfoTable.php similarity index 100% rename from tests/tables/PositionInfoTable.php rename to tests/Tabless/PositionInfoTable.php diff --git a/tests/tables/Schema.php b/tests/Tabless/Schema.php similarity index 100% rename from tests/tables/Schema.php rename to tests/Tabless/Schema.php diff --git a/tests/tables/Schema2.php b/tests/Tabless/Schema2.php similarity index 100% rename from tests/tables/Schema2.php rename to tests/Tabless/Schema2.php diff --git a/tests/tables/Schema3.php b/tests/Tabless/Schema3.php similarity index 100% rename from tests/tables/Schema3.php rename to tests/Tabless/Schema3.php diff --git a/tests/tables/UserInfoTable.php b/tests/Tabless/UserInfoTable.php similarity index 100% rename from tests/tables/UserInfoTable.php rename to tests/Tabless/UserInfoTable.php diff --git a/tests/test-entities/TestMiddleware.php b/tests/TestEntities/TestMiddleware.php similarity index 100% rename from tests/test-entities/TestMiddleware.php rename to tests/TestEntities/TestMiddleware.php diff --git a/tests/test-entities/UserContactInfo.php b/tests/TestEntities/UserContactInfo.php similarity index 100% rename from tests/test-entities/UserContactInfo.php rename to tests/TestEntities/UserContactInfo.php diff --git a/tests/test-entities/UserWithContact.php b/tests/TestEntities/UserWithContact.php similarity index 100% rename from tests/test-entities/UserWithContact.php rename to tests/TestEntities/UserWithContact.php diff --git a/tests/test-entities/UsersQuery.php b/tests/TestEntities/UsersQuery.php similarity index 100% rename from tests/test-entities/UsersQuery.php rename to tests/TestEntities/UsersQuery.php diff --git a/tests/webfiori - Copy/benchmark/RouterBench.php b/tests/WebFiori/Benchmark/RouterBench.php similarity index 100% rename from tests/webfiori - Copy/benchmark/RouterBench.php rename to tests/WebFiori/Benchmark/RouterBench.php diff --git a/tests/webfiori - Copy/framework/test/AccessTest.php b/tests/WebFiori/Framework/Tests/AccessTest.php similarity index 100% rename from tests/webfiori - Copy/framework/test/AccessTest.php rename to tests/WebFiori/Framework/Tests/AccessTest.php diff --git a/tests/webfiori - Copy/framework/test/ClassUtilTest.php b/tests/WebFiori/Framework/Tests/ClassUtilTest.php similarity index 100% rename from tests/webfiori - Copy/framework/test/ClassUtilTest.php rename to tests/WebFiori/Framework/Tests/ClassUtilTest.php diff --git a/tests/webfiori - Copy/framework/test/cli/AddCommandTest.php b/tests/WebFiori/Framework/Tests/Cli/AddCommandTest.php similarity index 100% rename from tests/webfiori - Copy/framework/test/cli/AddCommandTest.php rename to tests/WebFiori/Framework/Tests/Cli/AddCommandTest.php diff --git a/tests/webfiori - Copy/framework/test/cli/CreateAPITestCaseTest.php b/tests/WebFiori/Framework/Tests/Cli/CreateAPITestCaseTest.php similarity index 100% rename from tests/webfiori - Copy/framework/test/cli/CreateAPITestCaseTest.php rename to tests/WebFiori/Framework/Tests/Cli/CreateAPITestCaseTest.php diff --git a/tests/webfiori - Copy/framework/test/cli/CreateCLICommandTest.php b/tests/WebFiori/Framework/Tests/Cli/CreateCLICommandTest.php similarity index 100% rename from tests/webfiori - Copy/framework/test/cli/CreateCLICommandTest.php rename to tests/WebFiori/Framework/Tests/Cli/CreateCLICommandTest.php diff --git a/tests/webfiori - Copy/framework/test/cli/CreateCommandTest.php b/tests/WebFiori/Framework/Tests/Cli/CreateCommandTest.php similarity index 100% rename from tests/webfiori - Copy/framework/test/cli/CreateCommandTest.php rename to tests/WebFiori/Framework/Tests/Cli/CreateCommandTest.php diff --git a/tests/webfiori - Copy/framework/test/cli/CreateDBAccessTest.php b/tests/WebFiori/Framework/Tests/Cli/CreateDBAccessTest.php similarity index 100% rename from tests/webfiori - Copy/framework/test/cli/CreateDBAccessTest.php rename to tests/WebFiori/Framework/Tests/Cli/CreateDBAccessTest.php diff --git a/tests/webfiori - Copy/framework/test/cli/CreateEntityTest.php b/tests/WebFiori/Framework/Tests/Cli/CreateEntityTest.php similarity index 100% rename from tests/webfiori - Copy/framework/test/cli/CreateEntityTest.php rename to tests/WebFiori/Framework/Tests/Cli/CreateEntityTest.php diff --git a/tests/webfiori - Copy/framework/test/cli/CreateMiddlewareTest.php b/tests/WebFiori/Framework/Tests/Cli/CreateMiddlewareTest.php similarity index 100% rename from tests/webfiori - Copy/framework/test/cli/CreateMiddlewareTest.php rename to tests/WebFiori/Framework/Tests/Cli/CreateMiddlewareTest.php diff --git a/tests/webfiori - Copy/framework/test/cli/CreateMigrationTest.php b/tests/WebFiori/Framework/Tests/Cli/CreateMigrationTest.php similarity index 100% rename from tests/webfiori - Copy/framework/test/cli/CreateMigrationTest.php rename to tests/WebFiori/Framework/Tests/Cli/CreateMigrationTest.php diff --git a/tests/webfiori - Copy/framework/test/cli/CreateRESTTest.php b/tests/WebFiori/Framework/Tests/Cli/CreateRESTTest.php similarity index 100% rename from tests/webfiori - Copy/framework/test/cli/CreateRESTTest.php rename to tests/WebFiori/Framework/Tests/Cli/CreateRESTTest.php diff --git a/tests/webfiori - Copy/framework/test/cli/CreateTableTest.php b/tests/WebFiori/Framework/Tests/Cli/CreateTableTest.php similarity index 100% rename from tests/webfiori - Copy/framework/test/cli/CreateTableTest.php rename to tests/WebFiori/Framework/Tests/Cli/CreateTableTest.php diff --git a/tests/webfiori - Copy/framework/test/cli/CreateTaskTest.php b/tests/WebFiori/Framework/Tests/Cli/CreateTaskTest.php similarity index 100% rename from tests/webfiori - Copy/framework/test/cli/CreateTaskTest.php rename to tests/WebFiori/Framework/Tests/Cli/CreateTaskTest.php diff --git a/tests/webfiori - Copy/framework/test/cli/CreateThemeTest.php b/tests/WebFiori/Framework/Tests/Cli/CreateThemeTest.php similarity index 100% rename from tests/webfiori - Copy/framework/test/cli/CreateThemeTest.php rename to tests/WebFiori/Framework/Tests/Cli/CreateThemeTest.php diff --git a/tests/webfiori - Copy/framework/test/cli/CreateWebServiceTest.php b/tests/WebFiori/Framework/Tests/Cli/CreateWebServiceTest.php similarity index 100% rename from tests/webfiori - Copy/framework/test/cli/CreateWebServiceTest.php rename to tests/WebFiori/Framework/Tests/Cli/CreateWebServiceTest.php diff --git a/tests/webfiori - Copy/framework/test/cli/DBClassWritterTest.php b/tests/WebFiori/Framework/Tests/Cli/DBClassWritterTest.php similarity index 100% rename from tests/webfiori - Copy/framework/test/cli/DBClassWritterTest.php rename to tests/WebFiori/Framework/Tests/Cli/DBClassWritterTest.php diff --git a/tests/webfiori - Copy/framework/test/cli/HelpCommandTest.php b/tests/WebFiori/Framework/Tests/Cli/HelpCommandTest.php similarity index 100% rename from tests/webfiori - Copy/framework/test/cli/HelpCommandTest.php rename to tests/WebFiori/Framework/Tests/Cli/HelpCommandTest.php diff --git a/tests/webfiori - Copy/framework/test/cli/ListRoutesCommandTest.php b/tests/WebFiori/Framework/Tests/Cli/ListRoutesCommandTest.php similarity index 100% rename from tests/webfiori - Copy/framework/test/cli/ListRoutesCommandTest.php rename to tests/WebFiori/Framework/Tests/Cli/ListRoutesCommandTest.php diff --git a/tests/webfiori - Copy/framework/test/cli/ListThemesCommandTest.php b/tests/WebFiori/Framework/Tests/Cli/ListThemesCommandTest.php similarity index 100% rename from tests/webfiori - Copy/framework/test/cli/ListThemesCommandTest.php rename to tests/WebFiori/Framework/Tests/Cli/ListThemesCommandTest.php diff --git a/tests/webfiori - Copy/framework/test/cli/RunMigrationsCommandTest.php b/tests/WebFiori/Framework/Tests/Cli/RunMigrationsCommandTest.php similarity index 100% rename from tests/webfiori - Copy/framework/test/cli/RunMigrationsCommandTest.php rename to tests/WebFiori/Framework/Tests/Cli/RunMigrationsCommandTest.php diff --git a/tests/webfiori - Copy/framework/test/cli/RunSQLCommandTest.php b/tests/WebFiori/Framework/Tests/Cli/RunSQLCommandTest.php similarity index 100% rename from tests/webfiori - Copy/framework/test/cli/RunSQLCommandTest.php rename to tests/WebFiori/Framework/Tests/Cli/RunSQLCommandTest.php diff --git a/tests/webfiori - Copy/framework/test/cli/SchedulerCommandTest.php b/tests/WebFiori/Framework/Tests/Cli/SchedulerCommandTest.php similarity index 100% rename from tests/webfiori - Copy/framework/test/cli/SchedulerCommandTest.php rename to tests/WebFiori/Framework/Tests/Cli/SchedulerCommandTest.php diff --git a/tests/webfiori - Copy/framework/test/cli/SettingsCommandTest.php b/tests/WebFiori/Framework/Tests/Cli/SettingsCommandTest.php similarity index 100% rename from tests/webfiori - Copy/framework/test/cli/SettingsCommandTest.php rename to tests/WebFiori/Framework/Tests/Cli/SettingsCommandTest.php diff --git a/tests/webfiori - Copy/framework/test/cli/UpdateSettingsCommandTest.php b/tests/WebFiori/Framework/Tests/Cli/UpdateSettingsCommandTest.php similarity index 100% rename from tests/webfiori - Copy/framework/test/cli/UpdateSettingsCommandTest.php rename to tests/WebFiori/Framework/Tests/Cli/UpdateSettingsCommandTest.php diff --git a/tests/webfiori - Copy/framework/test/cli/UpdateTableCommandTest.php b/tests/WebFiori/Framework/Tests/Cli/UpdateTableCommandTest.php similarity index 100% rename from tests/webfiori - Copy/framework/test/cli/UpdateTableCommandTest.php rename to tests/WebFiori/Framework/Tests/Cli/UpdateTableCommandTest.php diff --git a/tests/webfiori - Copy/framework/test/cli/VersionCommandTest.php b/tests/WebFiori/Framework/Tests/Cli/VersionCommandTest.php similarity index 100% rename from tests/webfiori - Copy/framework/test/cli/VersionCommandTest.php rename to tests/WebFiori/Framework/Tests/Cli/VersionCommandTest.php diff --git a/tests/webfiori - Copy/framework/test/config/JsonDriverTest.php b/tests/WebFiori/Framework/Tests/Config/JsonDriverTest.php similarity index 100% rename from tests/webfiori - Copy/framework/test/config/JsonDriverTest.php rename to tests/WebFiori/Framework/Tests/Config/JsonDriverTest.php diff --git a/tests/webfiori - Copy/framework/test/DBTest.php b/tests/WebFiori/Framework/Tests/DBTest.php similarity index 100% rename from tests/webfiori - Copy/framework/test/DBTest.php rename to tests/WebFiori/Framework/Tests/DBTest.php diff --git a/tests/webfiori - Copy/framework/test/langs/LanguageTest.php b/tests/WebFiori/Framework/Tests/Langs/LanguageTest.php similarity index 100% rename from tests/webfiori - Copy/framework/test/langs/LanguageTest.php rename to tests/WebFiori/Framework/Tests/Langs/LanguageTest.php diff --git a/tests/webfiori - Copy/framework/test/mail/EmailMessageTest.php b/tests/WebFiori/Framework/Tests/Mail/EmailMessageTest.php similarity index 100% rename from tests/webfiori - Copy/framework/test/mail/EmailMessageTest.php rename to tests/WebFiori/Framework/Tests/Mail/EmailMessageTest.php diff --git a/tests/webfiori - Copy/framework/test/PageTest.php b/tests/WebFiori/Framework/Tests/PageTest.php similarity index 100% rename from tests/webfiori - Copy/framework/test/PageTest.php rename to tests/WebFiori/Framework/Tests/PageTest.php diff --git a/tests/webfiori - Copy/framework/test/PrivilegeTest.php b/tests/WebFiori/Framework/Tests/PrivilegeTest.php similarity index 100% rename from tests/webfiori - Copy/framework/test/PrivilegeTest.php rename to tests/WebFiori/Framework/Tests/PrivilegeTest.php diff --git a/tests/webfiori - Copy/framework/test/PrivilegesGroupTest.php b/tests/WebFiori/Framework/Tests/PrivilegesGroupTest.php similarity index 100% rename from tests/webfiori - Copy/framework/test/PrivilegesGroupTest.php rename to tests/WebFiori/Framework/Tests/PrivilegesGroupTest.php diff --git a/tests/webfiori - Copy/framework/test/ResponseTest.php b/tests/WebFiori/Framework/Tests/ResponseTest.php similarity index 100% rename from tests/webfiori - Copy/framework/test/ResponseTest.php rename to tests/WebFiori/Framework/Tests/ResponseTest.php diff --git a/tests/webfiori - Copy/framework/test/router/RouterTest.php b/tests/WebFiori/Framework/Tests/Router/RouterTest.php similarity index 100% rename from tests/webfiori - Copy/framework/test/router/RouterTest.php rename to tests/WebFiori/Framework/Tests/Router/RouterTest.php diff --git a/tests/webfiori - Copy/framework/test/router/RouterUriTest.php b/tests/WebFiori/Framework/Tests/Router/RouterUriTest.php similarity index 100% rename from tests/webfiori - Copy/framework/test/router/RouterUriTest.php rename to tests/WebFiori/Framework/Tests/Router/RouterUriTest.php diff --git a/tests/webfiori - Copy/framework/test/scheduler/JobArgumentTest.php b/tests/WebFiori/Framework/Tests/Scheduler/JobArgumentTest.php similarity index 100% rename from tests/webfiori - Copy/framework/test/scheduler/JobArgumentTest.php rename to tests/WebFiori/Framework/Tests/Scheduler/JobArgumentTest.php diff --git a/tests/webfiori - Copy/framework/test/scheduler/SchedulerTaskTest.php b/tests/WebFiori/Framework/Tests/Scheduler/SchedulerTaskTest.php similarity index 100% rename from tests/webfiori - Copy/framework/test/scheduler/SchedulerTaskTest.php rename to tests/WebFiori/Framework/Tests/Scheduler/SchedulerTaskTest.php diff --git a/tests/webfiori - Copy/framework/test/scheduler/SchedulerTest.php b/tests/WebFiori/Framework/Tests/Scheduler/SchedulerTest.php similarity index 100% rename from tests/webfiori - Copy/framework/test/scheduler/SchedulerTest.php rename to tests/WebFiori/Framework/Tests/Scheduler/SchedulerTest.php diff --git a/tests/webfiori - Copy/framework/test/session/SessionTest.php b/tests/WebFiori/Framework/Tests/Session/SessionTest.php similarity index 100% rename from tests/webfiori - Copy/framework/test/session/SessionTest.php rename to tests/WebFiori/Framework/Tests/Session/SessionTest.php diff --git a/tests/webfiori - Copy/framework/test/session/SessionsManagerTest.php b/tests/WebFiori/Framework/Tests/Session/SessionsManagerTest.php similarity index 100% rename from tests/webfiori - Copy/framework/test/session/SessionsManagerTest.php rename to tests/WebFiori/Framework/Tests/Session/SessionsManagerTest.php diff --git a/tests/webfiori - Copy/framework/test/TestAutoLoader.php b/tests/WebFiori/Framework/Tests/TestAutoLoader.php similarity index 100% rename from tests/webfiori - Copy/framework/test/TestAutoLoader.php rename to tests/WebFiori/Framework/Tests/TestAutoLoader.php diff --git a/tests/webfiori - Copy/framework/test/theme/ThemeTest.php b/tests/WebFiori/Framework/Tests/Theme/ThemeTest.php similarity index 100% rename from tests/webfiori - Copy/framework/test/theme/ThemeTest.php rename to tests/WebFiori/Framework/Tests/Theme/ThemeTest.php diff --git a/tests/webfiori - Copy/framework/test/UserTest.php b/tests/WebFiori/Framework/Tests/UserTest.php similarity index 100% rename from tests/webfiori - Copy/framework/test/UserTest.php rename to tests/WebFiori/Framework/Tests/UserTest.php diff --git a/tests/webfiori - Copy/framework/test/UtilTest.php b/tests/WebFiori/Framework/Tests/UtilTest.php similarity index 100% rename from tests/webfiori - Copy/framework/test/UtilTest.php rename to tests/WebFiori/Framework/Tests/UtilTest.php diff --git a/tests/webfiori - Copy/framework/test/writers/BackgroundTaskWritterTest.php b/tests/WebFiori/Framework/Tests/Writers/BackgroundTaskWritterTest.php similarity index 100% rename from tests/webfiori - Copy/framework/test/writers/BackgroundTaskWritterTest.php rename to tests/WebFiori/Framework/Tests/Writers/BackgroundTaskWritterTest.php diff --git a/tests/webfiori - Copy/framework/test/writers/CLICommandClassWriterTest.php b/tests/WebFiori/Framework/Tests/Writers/CLICommandClassWriterTest.php similarity index 100% rename from tests/webfiori - Copy/framework/test/writers/CLICommandClassWriterTest.php rename to tests/WebFiori/Framework/Tests/Writers/CLICommandClassWriterTest.php diff --git a/tests/webfiori - Copy/framework/test/writers/DatabaseMigrationWriterTest.php b/tests/WebFiori/Framework/Tests/Writers/DatabaseMigrationWriterTest.php similarity index 100% rename from tests/webfiori - Copy/framework/test/writers/DatabaseMigrationWriterTest.php rename to tests/WebFiori/Framework/Tests/Writers/DatabaseMigrationWriterTest.php diff --git a/tests/webfiori - Copy/framework/test/writers/LangWritterTest.php b/tests/WebFiori/Framework/Tests/Writers/LangWritterTest.php similarity index 100% rename from tests/webfiori - Copy/framework/test/writers/LangWritterTest.php rename to tests/WebFiori/Framework/Tests/Writers/LangWritterTest.php diff --git a/tests/webfiori - Copy/framework/test/writers/MiddlewareWritterTest.php b/tests/WebFiori/Framework/Tests/Writers/MiddlewareWritterTest.php similarity index 100% rename from tests/webfiori - Copy/framework/test/writers/MiddlewareWritterTest.php rename to tests/WebFiori/Framework/Tests/Writers/MiddlewareWritterTest.php diff --git a/tests/webfiori - Copy/framework/test/writers/TableWritterTest.php b/tests/WebFiori/Framework/Tests/Writers/TableWritterTest.php similarity index 100% rename from tests/webfiori - Copy/framework/test/writers/TableWritterTest.php rename to tests/WebFiori/Framework/Tests/Writers/TableWritterTest.php diff --git a/tests/webfiori - Copy/framework/test/writers/ThemeWritterTest.php b/tests/WebFiori/Framework/Tests/Writers/ThemeWritterTest.php similarity index 100% rename from tests/webfiori - Copy/framework/test/writers/ThemeWritterTest.php rename to tests/WebFiori/Framework/Tests/Writers/ThemeWritterTest.php diff --git a/tests/webfiori - Copy/framework/test/writers/WebServiceTestCaseWriterTest.php b/tests/WebFiori/Framework/Tests/Writers/WebServiceTestCaseWriterTest.php similarity index 100% rename from tests/webfiori - Copy/framework/test/writers/WebServiceTestCaseWriterTest.php rename to tests/WebFiori/Framework/Tests/Writers/WebServiceTestCaseWriterTest.php diff --git a/tests/webfiori - Copy/framework/test/writers/WebServiceWritterTest.php b/tests/WebFiori/Framework/Tests/Writers/WebServiceWritterTest.php similarity index 100% rename from tests/webfiori - Copy/framework/test/writers/WebServiceWritterTest.php rename to tests/WebFiori/Framework/Tests/Writers/WebServiceWritterTest.php diff --git a/themes/fiori/.gitkeep b/themess/fiori/.gitkeep similarity index 100% rename from themes/fiori/.gitkeep rename to themess/fiori/.gitkeep diff --git a/themes/fioriTheme/AsideSection.php b/themess/fioriTheme/AsideSection.php similarity index 100% rename from themes/fioriTheme/AsideSection.php rename to themess/fioriTheme/AsideSection.php diff --git a/themes/fioriTheme/FooterSection.php b/themess/fioriTheme/FooterSection.php similarity index 100% rename from themes/fioriTheme/FooterSection.php rename to themess/fioriTheme/FooterSection.php diff --git a/themes/fioriTheme/HeadSection.php b/themess/fioriTheme/HeadSection.php similarity index 100% rename from themes/fioriTheme/HeadSection.php rename to themess/fioriTheme/HeadSection.php diff --git a/themes/fioriTheme/HeaderSection.php b/themess/fioriTheme/HeaderSection.php similarity index 100% rename from themes/fioriTheme/HeaderSection.php rename to themess/fioriTheme/HeaderSection.php diff --git a/themes/fioriTheme/NewFTestTheme.php b/themess/fioriTheme/NewFTestTheme.php similarity index 100% rename from themes/fioriTheme/NewFTestTheme.php rename to themess/fioriTheme/NewFTestTheme.php diff --git a/themes/fioriTheme/assets/css/main.css b/themess/fioriTheme/assets/css/main.css similarity index 100% rename from themes/fioriTheme/assets/css/main.css rename to themess/fioriTheme/assets/css/main.css diff --git a/themes/fioriTheme/assets/images/favicon.png b/themess/fioriTheme/assets/images/favicon.png similarity index 100% rename from themes/fioriTheme/assets/images/favicon.png rename to themess/fioriTheme/assets/images/favicon.png diff --git a/themes/fioriTheme/assets/js/main.js b/themess/fioriTheme/assets/js/main.js similarity index 100% rename from themes/fioriTheme/assets/js/main.js rename to themess/fioriTheme/assets/js/main.js diff --git a/themes/fioriTheme2/AsideSection.php b/themess/fioriTheme2/AsideSection.php similarity index 100% rename from themes/fioriTheme2/AsideSection.php rename to themess/fioriTheme2/AsideSection.php diff --git a/themes/fioriTheme2/FooterSection.php b/themess/fioriTheme2/FooterSection.php similarity index 100% rename from themes/fioriTheme2/FooterSection.php rename to themess/fioriTheme2/FooterSection.php diff --git a/themes/fioriTheme2/HeadSection.php b/themess/fioriTheme2/HeadSection.php similarity index 100% rename from themes/fioriTheme2/HeadSection.php rename to themess/fioriTheme2/HeadSection.php diff --git a/themes/fioriTheme2/HeaderSection.php b/themess/fioriTheme2/HeaderSection.php similarity index 100% rename from themes/fioriTheme2/HeaderSection.php rename to themess/fioriTheme2/HeaderSection.php diff --git a/themes/fioriTheme2/NewTestTheme2.php b/themess/fioriTheme2/NewTestTheme2.php similarity index 100% rename from themes/fioriTheme2/NewTestTheme2.php rename to themess/fioriTheme2/NewTestTheme2.php From e9e7ebf9e0f0bf86c060b940ece832dd266c5d99 Mon Sep 17 00:00:00 2001 From: Ibrahim BinAlshikh Date: Tue, 7 Oct 2025 19:24:15 +0300 Subject: [PATCH 03/45] refactor: Moved Files --- {appp/apis => App/Apis}/.gitkeep | 0 {appp/apis => App/Apis}/RoutingTestClass.php | 0 {appp/apis => App/Apis}/super/temp | 0 {appp/commands => App/Commands}/.gitkeep | 0 {appp/config => App/Config}/config-with-err-00.json | 0 {appp/database => App/Database}/Test2Table.php | 0 {appp/database => App/Database}/TestTable.php | 0 {appp/database => App/Database}/empl/temp | 0 {appp/database => App/Database}/migrations/.gitkeep | 0 .../Database}/migrations/commands/.gitkeep | 0 .../Database}/migrations/emptyRunner/XRunner.php | 0 .../Database}/migrations/multi/Migration000.php | 0 .../Database}/migrations/multi/Migration001.php | 0 .../Database}/migrations/multi/Migration002.php | 0 .../Database}/migrations/multi/MultiRunner.php | 0 .../migrations/multiDownErr/Migration000.php | 0 .../migrations/multiDownErr/Migration001.php | 0 .../migrations/multiDownErr/Migration002.php | 0 .../migrations/multiDownErr/MultiErrRunner.php | 0 .../Database}/migrations/multiErr/Migration000.php | 0 .../Database}/migrations/multiErr/Migration001.php | 0 .../Database}/migrations/multiErr/Migration002.php | 0 .../migrations/multiErr/MultiErrRunner.php | 0 .../Database}/migrations/noConn/Migration000.php | 0 .../Database}/migrations/noConn/XRunner.php | 0 {appp/database => App/Database}/sql-file.sql | 0 {appp/database => App/Database}/super/temp | 0 {appp/entity => App/Entity}/WithException.php | 0 {appp/middleware => App/Entity/super}/temp | 0 {appp/tasks => App/Entity}/temp | 0 {appp/ini => App/Init}/InitAutoLoad.php | 0 {appp/ini => App/Init}/InitCliCommands.php | 0 {appp/ini => App/Init}/InitCommands.php | 0 {appp/ini => App/Init}/InitMiddleware.php | 0 {appp/ini => App/Init}/InitPrivileges.php | 0 {appp/ini => App/Init}/InitTasks.php | 0 {appp/ini => App/Init}/routes/APIsRoutes.php | 0 {appp/ini => App/Init}/routes/ClosureRoutes.php | 0 {appp/ini => App/Init}/routes/OtherRoutes.php | 0 {appp/ini => App/Init}/routes/PagesRoutes.php | 0 {appp/langs => App/Langs}/LangAR.php | 0 {appp/langs => App/Langs}/LangEN.php | 0 {appp/langs => App/Langs}/LangFR.php | 0 {appp/langs => App/Langs}/LangGB.php | 0 {appp/langs => App/Langs}/LangJP.php | 0 .../Middleware}/CoolMiddleware.php | 0 {appp/themes/cool => App/Middleware}/temp | 0 {appp/tasks => App/Tasks}/Fail1TestTask.php | 0 {appp/tasks => App/Tasks}/Fail2TestTask.php | 0 {appp/tasks => App/Tasks}/Fail3TestTask.php | 0 .../tasks => App/Tasks}/SuccessTestEveryMinute.php | 0 {appp/tasks => App/Tasks}/SuccessTestTask.php | 0 themess/fiori/.gitkeep => App/Tasks/temp | 0 App/Themes/cool/temp | 1 + .../FioriTheme}/AsideSection.php | 0 .../FioriTheme}/FooterSection.php | 0 .../FioriTheme}/HeadSection.php | 0 .../FioriTheme}/HeaderSection.php | 0 .../FioriTheme}/NewFTestTheme.php | 0 .../FioriTheme}/assets/css/main.css | 0 .../FioriTheme}/assets/images/favicon.png | Bin .../FioriTheme}/assets/js/main.js | 0 .../FioriTheme2}/AsideSection.php | 0 .../FioriTheme2}/FooterSection.php | 0 .../FioriTheme2}/HeadSection.php | 0 .../FioriTheme2}/HeaderSection.php | 0 .../FioriTheme2}/NewTestTheme2.php | 0 Themes/fiori/.gitkeep | 1 + 68 files changed, 2 insertions(+) rename {appp/apis => App/Apis}/.gitkeep (100%) rename {appp/apis => App/Apis}/RoutingTestClass.php (100%) rename {appp/apis => App/Apis}/super/temp (100%) rename {appp/commands => App/Commands}/.gitkeep (100%) rename {appp/config => App/Config}/config-with-err-00.json (100%) rename {appp/database => App/Database}/Test2Table.php (100%) rename {appp/database => App/Database}/TestTable.php (100%) rename {appp/database => App/Database}/empl/temp (100%) rename {appp/database => App/Database}/migrations/.gitkeep (100%) rename {appp/database => App/Database}/migrations/commands/.gitkeep (100%) rename {appp/database => App/Database}/migrations/emptyRunner/XRunner.php (100%) rename {appp/database => App/Database}/migrations/multi/Migration000.php (100%) rename {appp/database => App/Database}/migrations/multi/Migration001.php (100%) rename {appp/database => App/Database}/migrations/multi/Migration002.php (100%) rename {appp/database => App/Database}/migrations/multi/MultiRunner.php (100%) rename {appp/database => App/Database}/migrations/multiDownErr/Migration000.php (100%) rename {appp/database => App/Database}/migrations/multiDownErr/Migration001.php (100%) rename {appp/database => App/Database}/migrations/multiDownErr/Migration002.php (100%) rename {appp/database => App/Database}/migrations/multiDownErr/MultiErrRunner.php (100%) rename {appp/database => App/Database}/migrations/multiErr/Migration000.php (100%) rename {appp/database => App/Database}/migrations/multiErr/Migration001.php (100%) rename {appp/database => App/Database}/migrations/multiErr/Migration002.php (100%) rename {appp/database => App/Database}/migrations/multiErr/MultiErrRunner.php (100%) rename {appp/database => App/Database}/migrations/noConn/Migration000.php (100%) rename {appp/database => App/Database}/migrations/noConn/XRunner.php (100%) rename {appp/database => App/Database}/sql-file.sql (100%) rename {appp/database => App/Database}/super/temp (100%) rename {appp/entity => App/Entity}/WithException.php (100%) rename {appp/middleware => App/Entity/super}/temp (100%) rename {appp/tasks => App/Entity}/temp (100%) rename {appp/ini => App/Init}/InitAutoLoad.php (100%) rename {appp/ini => App/Init}/InitCliCommands.php (100%) rename {appp/ini => App/Init}/InitCommands.php (100%) rename {appp/ini => App/Init}/InitMiddleware.php (100%) rename {appp/ini => App/Init}/InitPrivileges.php (100%) rename {appp/ini => App/Init}/InitTasks.php (100%) rename {appp/ini => App/Init}/routes/APIsRoutes.php (100%) rename {appp/ini => App/Init}/routes/ClosureRoutes.php (100%) rename {appp/ini => App/Init}/routes/OtherRoutes.php (100%) rename {appp/ini => App/Init}/routes/PagesRoutes.php (100%) rename {appp/langs => App/Langs}/LangAR.php (100%) rename {appp/langs => App/Langs}/LangEN.php (100%) rename {appp/langs => App/Langs}/LangFR.php (100%) rename {appp/langs => App/Langs}/LangGB.php (100%) rename {appp/langs => App/Langs}/LangJP.php (100%) rename {appp/middleware => App/Middleware}/CoolMiddleware.php (100%) rename {appp/themes/cool => App/Middleware}/temp (100%) rename {appp/tasks => App/Tasks}/Fail1TestTask.php (100%) rename {appp/tasks => App/Tasks}/Fail2TestTask.php (100%) rename {appp/tasks => App/Tasks}/Fail3TestTask.php (100%) rename {appp/tasks => App/Tasks}/SuccessTestEveryMinute.php (100%) rename {appp/tasks => App/Tasks}/SuccessTestTask.php (100%) rename themess/fiori/.gitkeep => App/Tasks/temp (100%) create mode 100644 App/Themes/cool/temp rename {themess/fioriTheme => Themes/FioriTheme}/AsideSection.php (100%) rename {themess/fioriTheme => Themes/FioriTheme}/FooterSection.php (100%) rename {themess/fioriTheme => Themes/FioriTheme}/HeadSection.php (100%) rename {themess/fioriTheme => Themes/FioriTheme}/HeaderSection.php (100%) rename {themess/fioriTheme => Themes/FioriTheme}/NewFTestTheme.php (100%) rename {themess/fioriTheme => Themes/FioriTheme}/assets/css/main.css (100%) rename {themess/fioriTheme => Themes/FioriTheme}/assets/images/favicon.png (100%) rename {themess/fioriTheme => Themes/FioriTheme}/assets/js/main.js (100%) rename {themess/fioriTheme2 => Themes/FioriTheme2}/AsideSection.php (100%) rename {themess/fioriTheme2 => Themes/FioriTheme2}/FooterSection.php (100%) rename {themess/fioriTheme2 => Themes/FioriTheme2}/HeadSection.php (100%) rename {themess/fioriTheme2 => Themes/FioriTheme2}/HeaderSection.php (100%) rename {themess/fioriTheme2 => Themes/FioriTheme2}/NewTestTheme2.php (100%) create mode 100644 Themes/fiori/.gitkeep diff --git a/appp/apis/.gitkeep b/App/Apis/.gitkeep similarity index 100% rename from appp/apis/.gitkeep rename to App/Apis/.gitkeep diff --git a/appp/apis/RoutingTestClass.php b/App/Apis/RoutingTestClass.php similarity index 100% rename from appp/apis/RoutingTestClass.php rename to App/Apis/RoutingTestClass.php diff --git a/appp/apis/super/temp b/App/Apis/super/temp similarity index 100% rename from appp/apis/super/temp rename to App/Apis/super/temp diff --git a/appp/commands/.gitkeep b/App/Commands/.gitkeep similarity index 100% rename from appp/commands/.gitkeep rename to App/Commands/.gitkeep diff --git a/appp/config/config-with-err-00.json b/App/Config/config-with-err-00.json similarity index 100% rename from appp/config/config-with-err-00.json rename to App/Config/config-with-err-00.json diff --git a/appp/database/Test2Table.php b/App/Database/Test2Table.php similarity index 100% rename from appp/database/Test2Table.php rename to App/Database/Test2Table.php diff --git a/appp/database/TestTable.php b/App/Database/TestTable.php similarity index 100% rename from appp/database/TestTable.php rename to App/Database/TestTable.php diff --git a/appp/database/empl/temp b/App/Database/empl/temp similarity index 100% rename from appp/database/empl/temp rename to App/Database/empl/temp diff --git a/appp/database/migrations/.gitkeep b/App/Database/migrations/.gitkeep similarity index 100% rename from appp/database/migrations/.gitkeep rename to App/Database/migrations/.gitkeep diff --git a/appp/database/migrations/commands/.gitkeep b/App/Database/migrations/commands/.gitkeep similarity index 100% rename from appp/database/migrations/commands/.gitkeep rename to App/Database/migrations/commands/.gitkeep diff --git a/appp/database/migrations/emptyRunner/XRunner.php b/App/Database/migrations/emptyRunner/XRunner.php similarity index 100% rename from appp/database/migrations/emptyRunner/XRunner.php rename to App/Database/migrations/emptyRunner/XRunner.php diff --git a/appp/database/migrations/multi/Migration000.php b/App/Database/migrations/multi/Migration000.php similarity index 100% rename from appp/database/migrations/multi/Migration000.php rename to App/Database/migrations/multi/Migration000.php diff --git a/appp/database/migrations/multi/Migration001.php b/App/Database/migrations/multi/Migration001.php similarity index 100% rename from appp/database/migrations/multi/Migration001.php rename to App/Database/migrations/multi/Migration001.php diff --git a/appp/database/migrations/multi/Migration002.php b/App/Database/migrations/multi/Migration002.php similarity index 100% rename from appp/database/migrations/multi/Migration002.php rename to App/Database/migrations/multi/Migration002.php diff --git a/appp/database/migrations/multi/MultiRunner.php b/App/Database/migrations/multi/MultiRunner.php similarity index 100% rename from appp/database/migrations/multi/MultiRunner.php rename to App/Database/migrations/multi/MultiRunner.php diff --git a/appp/database/migrations/multiDownErr/Migration000.php b/App/Database/migrations/multiDownErr/Migration000.php similarity index 100% rename from appp/database/migrations/multiDownErr/Migration000.php rename to App/Database/migrations/multiDownErr/Migration000.php diff --git a/appp/database/migrations/multiDownErr/Migration001.php b/App/Database/migrations/multiDownErr/Migration001.php similarity index 100% rename from appp/database/migrations/multiDownErr/Migration001.php rename to App/Database/migrations/multiDownErr/Migration001.php diff --git a/appp/database/migrations/multiDownErr/Migration002.php b/App/Database/migrations/multiDownErr/Migration002.php similarity index 100% rename from appp/database/migrations/multiDownErr/Migration002.php rename to App/Database/migrations/multiDownErr/Migration002.php diff --git a/appp/database/migrations/multiDownErr/MultiErrRunner.php b/App/Database/migrations/multiDownErr/MultiErrRunner.php similarity index 100% rename from appp/database/migrations/multiDownErr/MultiErrRunner.php rename to App/Database/migrations/multiDownErr/MultiErrRunner.php diff --git a/appp/database/migrations/multiErr/Migration000.php b/App/Database/migrations/multiErr/Migration000.php similarity index 100% rename from appp/database/migrations/multiErr/Migration000.php rename to App/Database/migrations/multiErr/Migration000.php diff --git a/appp/database/migrations/multiErr/Migration001.php b/App/Database/migrations/multiErr/Migration001.php similarity index 100% rename from appp/database/migrations/multiErr/Migration001.php rename to App/Database/migrations/multiErr/Migration001.php diff --git a/appp/database/migrations/multiErr/Migration002.php b/App/Database/migrations/multiErr/Migration002.php similarity index 100% rename from appp/database/migrations/multiErr/Migration002.php rename to App/Database/migrations/multiErr/Migration002.php diff --git a/appp/database/migrations/multiErr/MultiErrRunner.php b/App/Database/migrations/multiErr/MultiErrRunner.php similarity index 100% rename from appp/database/migrations/multiErr/MultiErrRunner.php rename to App/Database/migrations/multiErr/MultiErrRunner.php diff --git a/appp/database/migrations/noConn/Migration000.php b/App/Database/migrations/noConn/Migration000.php similarity index 100% rename from appp/database/migrations/noConn/Migration000.php rename to App/Database/migrations/noConn/Migration000.php diff --git a/appp/database/migrations/noConn/XRunner.php b/App/Database/migrations/noConn/XRunner.php similarity index 100% rename from appp/database/migrations/noConn/XRunner.php rename to App/Database/migrations/noConn/XRunner.php diff --git a/appp/database/sql-file.sql b/App/Database/sql-file.sql similarity index 100% rename from appp/database/sql-file.sql rename to App/Database/sql-file.sql diff --git a/appp/database/super/temp b/App/Database/super/temp similarity index 100% rename from appp/database/super/temp rename to App/Database/super/temp diff --git a/appp/entity/WithException.php b/App/Entity/WithException.php similarity index 100% rename from appp/entity/WithException.php rename to App/Entity/WithException.php diff --git a/appp/middleware/temp b/App/Entity/super/temp similarity index 100% rename from appp/middleware/temp rename to App/Entity/super/temp diff --git a/appp/tasks/temp b/App/Entity/temp similarity index 100% rename from appp/tasks/temp rename to App/Entity/temp diff --git a/appp/ini/InitAutoLoad.php b/App/Init/InitAutoLoad.php similarity index 100% rename from appp/ini/InitAutoLoad.php rename to App/Init/InitAutoLoad.php diff --git a/appp/ini/InitCliCommands.php b/App/Init/InitCliCommands.php similarity index 100% rename from appp/ini/InitCliCommands.php rename to App/Init/InitCliCommands.php diff --git a/appp/ini/InitCommands.php b/App/Init/InitCommands.php similarity index 100% rename from appp/ini/InitCommands.php rename to App/Init/InitCommands.php diff --git a/appp/ini/InitMiddleware.php b/App/Init/InitMiddleware.php similarity index 100% rename from appp/ini/InitMiddleware.php rename to App/Init/InitMiddleware.php diff --git a/appp/ini/InitPrivileges.php b/App/Init/InitPrivileges.php similarity index 100% rename from appp/ini/InitPrivileges.php rename to App/Init/InitPrivileges.php diff --git a/appp/ini/InitTasks.php b/App/Init/InitTasks.php similarity index 100% rename from appp/ini/InitTasks.php rename to App/Init/InitTasks.php diff --git a/appp/ini/routes/APIsRoutes.php b/App/Init/routes/APIsRoutes.php similarity index 100% rename from appp/ini/routes/APIsRoutes.php rename to App/Init/routes/APIsRoutes.php diff --git a/appp/ini/routes/ClosureRoutes.php b/App/Init/routes/ClosureRoutes.php similarity index 100% rename from appp/ini/routes/ClosureRoutes.php rename to App/Init/routes/ClosureRoutes.php diff --git a/appp/ini/routes/OtherRoutes.php b/App/Init/routes/OtherRoutes.php similarity index 100% rename from appp/ini/routes/OtherRoutes.php rename to App/Init/routes/OtherRoutes.php diff --git a/appp/ini/routes/PagesRoutes.php b/App/Init/routes/PagesRoutes.php similarity index 100% rename from appp/ini/routes/PagesRoutes.php rename to App/Init/routes/PagesRoutes.php diff --git a/appp/langs/LangAR.php b/App/Langs/LangAR.php similarity index 100% rename from appp/langs/LangAR.php rename to App/Langs/LangAR.php diff --git a/appp/langs/LangEN.php b/App/Langs/LangEN.php similarity index 100% rename from appp/langs/LangEN.php rename to App/Langs/LangEN.php diff --git a/appp/langs/LangFR.php b/App/Langs/LangFR.php similarity index 100% rename from appp/langs/LangFR.php rename to App/Langs/LangFR.php diff --git a/appp/langs/LangGB.php b/App/Langs/LangGB.php similarity index 100% rename from appp/langs/LangGB.php rename to App/Langs/LangGB.php diff --git a/appp/langs/LangJP.php b/App/Langs/LangJP.php similarity index 100% rename from appp/langs/LangJP.php rename to App/Langs/LangJP.php diff --git a/appp/middleware/CoolMiddleware.php b/App/Middleware/CoolMiddleware.php similarity index 100% rename from appp/middleware/CoolMiddleware.php rename to App/Middleware/CoolMiddleware.php diff --git a/appp/themes/cool/temp b/App/Middleware/temp similarity index 100% rename from appp/themes/cool/temp rename to App/Middleware/temp diff --git a/appp/tasks/Fail1TestTask.php b/App/Tasks/Fail1TestTask.php similarity index 100% rename from appp/tasks/Fail1TestTask.php rename to App/Tasks/Fail1TestTask.php diff --git a/appp/tasks/Fail2TestTask.php b/App/Tasks/Fail2TestTask.php similarity index 100% rename from appp/tasks/Fail2TestTask.php rename to App/Tasks/Fail2TestTask.php diff --git a/appp/tasks/Fail3TestTask.php b/App/Tasks/Fail3TestTask.php similarity index 100% rename from appp/tasks/Fail3TestTask.php rename to App/Tasks/Fail3TestTask.php diff --git a/appp/tasks/SuccessTestEveryMinute.php b/App/Tasks/SuccessTestEveryMinute.php similarity index 100% rename from appp/tasks/SuccessTestEveryMinute.php rename to App/Tasks/SuccessTestEveryMinute.php diff --git a/appp/tasks/SuccessTestTask.php b/App/Tasks/SuccessTestTask.php similarity index 100% rename from appp/tasks/SuccessTestTask.php rename to App/Tasks/SuccessTestTask.php diff --git a/themess/fiori/.gitkeep b/App/Tasks/temp similarity index 100% rename from themess/fiori/.gitkeep rename to App/Tasks/temp diff --git a/App/Themes/cool/temp b/App/Themes/cool/temp new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/App/Themes/cool/temp @@ -0,0 +1 @@ + diff --git a/themess/fioriTheme/AsideSection.php b/Themes/FioriTheme/AsideSection.php similarity index 100% rename from themess/fioriTheme/AsideSection.php rename to Themes/FioriTheme/AsideSection.php diff --git a/themess/fioriTheme/FooterSection.php b/Themes/FioriTheme/FooterSection.php similarity index 100% rename from themess/fioriTheme/FooterSection.php rename to Themes/FioriTheme/FooterSection.php diff --git a/themess/fioriTheme/HeadSection.php b/Themes/FioriTheme/HeadSection.php similarity index 100% rename from themess/fioriTheme/HeadSection.php rename to Themes/FioriTheme/HeadSection.php diff --git a/themess/fioriTheme/HeaderSection.php b/Themes/FioriTheme/HeaderSection.php similarity index 100% rename from themess/fioriTheme/HeaderSection.php rename to Themes/FioriTheme/HeaderSection.php diff --git a/themess/fioriTheme/NewFTestTheme.php b/Themes/FioriTheme/NewFTestTheme.php similarity index 100% rename from themess/fioriTheme/NewFTestTheme.php rename to Themes/FioriTheme/NewFTestTheme.php diff --git a/themess/fioriTheme/assets/css/main.css b/Themes/FioriTheme/assets/css/main.css similarity index 100% rename from themess/fioriTheme/assets/css/main.css rename to Themes/FioriTheme/assets/css/main.css diff --git a/themess/fioriTheme/assets/images/favicon.png b/Themes/FioriTheme/assets/images/favicon.png similarity index 100% rename from themess/fioriTheme/assets/images/favicon.png rename to Themes/FioriTheme/assets/images/favicon.png diff --git a/themess/fioriTheme/assets/js/main.js b/Themes/FioriTheme/assets/js/main.js similarity index 100% rename from themess/fioriTheme/assets/js/main.js rename to Themes/FioriTheme/assets/js/main.js diff --git a/themess/fioriTheme2/AsideSection.php b/Themes/FioriTheme2/AsideSection.php similarity index 100% rename from themess/fioriTheme2/AsideSection.php rename to Themes/FioriTheme2/AsideSection.php diff --git a/themess/fioriTheme2/FooterSection.php b/Themes/FioriTheme2/FooterSection.php similarity index 100% rename from themess/fioriTheme2/FooterSection.php rename to Themes/FioriTheme2/FooterSection.php diff --git a/themess/fioriTheme2/HeadSection.php b/Themes/FioriTheme2/HeadSection.php similarity index 100% rename from themess/fioriTheme2/HeadSection.php rename to Themes/FioriTheme2/HeadSection.php diff --git a/themess/fioriTheme2/HeaderSection.php b/Themes/FioriTheme2/HeaderSection.php similarity index 100% rename from themess/fioriTheme2/HeaderSection.php rename to Themes/FioriTheme2/HeaderSection.php diff --git a/themess/fioriTheme2/NewTestTheme2.php b/Themes/FioriTheme2/NewTestTheme2.php similarity index 100% rename from themess/fioriTheme2/NewTestTheme2.php rename to Themes/FioriTheme2/NewTestTheme2.php diff --git a/Themes/fiori/.gitkeep b/Themes/fiori/.gitkeep new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/Themes/fiori/.gitkeep @@ -0,0 +1 @@ + From 539221476845dfe5f43cd63d483ad51d306bcbec Mon Sep 17 00:00:00 2001 From: Ibrahim BinAlshikh Date: Tue, 7 Oct 2025 19:27:12 +0300 Subject: [PATCH 04/45] test: Changed App Folder Name --- tests/bootstrap.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/bootstrap.php b/tests/bootstrap.php index aa22286c9..cf9903efa 100644 --- a/tests/bootstrap.php +++ b/tests/bootstrap.php @@ -94,7 +94,7 @@ fprintf(STDOUT,'Autoloader Initialized.'."\n"); fprintf(STDOUT,"---------------------------------\n"); fprintf(STDOUT,"Initializing application...\n"); -App::initiate('app', 'public', $ROOT); +App::initiate('App', 'public', $ROOT); App::start(); fprintf(STDOUT,'Done.'."\n"); fprintf(STDOUT,'Autoload Root Directory: \''.ClassLoader::get()->root().'\'.'."\n"); From 843c29117e9c5557183215ca57ac6b145b1fe06e Mon Sep 17 00:00:00 2001 From: Ibrahim BinAlshikh Date: Tue, 7 Oct 2025 19:37:47 +0300 Subject: [PATCH 05/45] refactor: Namespace Correction --- App/Apis/RoutingTestClass.php | 2 +- App/Database/Test2Table.php | 2 +- App/Database/TestTable.php | 2 +- .../migrations/emptyRunner/XRunner.php | 4 +- .../migrations/multi/Migration000.php | 2 +- .../migrations/multi/Migration001.php | 2 +- .../migrations/multi/Migration002.php | 2 +- App/Database/migrations/multi/MultiRunner.php | 2 +- .../migrations/multiDownErr/Migration000.php | 2 +- .../migrations/multiDownErr/Migration001.php | 2 +- .../migrations/multiDownErr/Migration002.php | 2 +- .../multiDownErr/MultiErrRunner.php | 2 +- .../migrations/multiErr/Migration000.php | 2 +- .../migrations/multiErr/Migration001.php | 2 +- .../migrations/multiErr/Migration002.php | 2 +- .../migrations/multiErr/MultiErrRunner.php | 2 +- .../migrations/noConn/Migration000.php | 2 +- App/Database/migrations/noConn/XRunner.php | 2 +- App/Entity/WithException.php | 2 +- App/Init/InitAutoLoad.php | 2 +- App/Init/InitCliCommands.php | 2 +- App/Init/InitCommands.php | 2 +- App/Init/InitMiddleware.php | 2 +- App/Init/InitPrivileges.php | 2 +- App/Init/InitTasks.php | 2 +- App/Init/routes/APIsRoutes.php | 2 +- App/Init/routes/ClosureRoutes.php | 2 +- App/Init/routes/OtherRoutes.php | 2 +- App/Init/routes/PagesRoutes.php | 2 +- App/Langs/LangAR.php | 4 +- App/Langs/LangEN.php | 4 +- App/Langs/LangFR.php | 2 +- App/Langs/LangGB.php | 2 +- App/Langs/LangJP.php | 4 +- App/Middleware/CoolMiddleware.php | 4 +- App/Tasks/Fail1TestTask.php | 8 +- App/Tasks/Fail2TestTask.php | 8 +- App/Tasks/Fail3TestTask.php | 6 +- App/Tasks/SuccessTestEveryMinute.php | 8 +- App/Tasks/SuccessTestTask.php | 6 +- Themes/FioriTheme/AsideSection.php | 2 +- Themes/FioriTheme/FooterSection.php | 2 +- Themes/FioriTheme/HeadSection.php | 2 +- Themes/FioriTheme/HeaderSection.php | 2 +- Themes/FioriTheme/NewFTestTheme.php | 4 +- Themes/FioriTheme2/AsideSection.php | 2 +- Themes/FioriTheme2/FooterSection.php | 2 +- Themes/FioriTheme2/HeadSection.php | 2 +- Themes/FioriTheme2/HeaderSection.php | 2 +- Themes/FioriTheme2/NewTestTheme2.php | 4 +- WebFiori/Framework/Access.php | 2 +- WebFiori/Framework/App.php | 82 ++++----- WebFiori/Framework/Autoload/ClassInfo.php | 2 +- WebFiori/Framework/Autoload/ClassLoader.php | 4 +- .../Autoload/ClassLoaderException.php | 2 +- WebFiori/Framework/Cli/CLITestCase.php | 4 +- WebFiori/Framework/Cli/CLIUtils.php | 6 +- .../Framework/Cli/Commands/AddCommand.php | 8 +- .../Framework/Cli/Commands/CreateCommand.php | 26 +-- .../Cli/Commands/ListRoutesCommand.php | 4 +- .../Cli/Commands/ListThemesCommand.php | 4 +- .../Cli/Commands/RunMigrationsCommand.php | 6 +- .../Cli/Commands/RunSQLQueryCommand.php | 12 +- .../Cli/Commands/SchedulerCommand.php | 6 +- .../Cli/Commands/SettingsCommand.php | 4 +- .../Cli/Commands/UpdateSettingsCommand.php | 10 +- .../Cli/Commands/UpdateTableCommand.php | 8 +- .../Framework/Cli/Commands/VersionCommand.php | 2 +- .../Framework/Cli/Commands/WHelpCommand.php | 2 +- .../Framework/Cli/Helpers/ClassInfoReader.php | 6 +- .../Cli/Helpers/CreateAPITestCase.php | 6 +- .../Cli/Helpers/CreateBackgroundTask.php | 10 +- .../Cli/Helpers/CreateCLIClassHelper.php | 6 +- .../Cli/Helpers/CreateClassHelper.php | 6 +- .../Cli/Helpers/CreateDBAccessHelper.php | 8 +- .../Cli/Helpers/CreateFullRESTHelper.php | 14 +- .../Cli/Helpers/CreateMiddleware.php | 6 +- .../Framework/Cli/Helpers/CreateMigration.php | 8 +- .../Framework/Cli/Helpers/CreateTableObj.php | 8 +- .../Cli/Helpers/CreateThemeHelper.php | 6 +- .../Cli/Helpers/CreateWebService.php | 8 +- .../Framework/Cli/Helpers/TableObjHelper.php | 8 +- WebFiori/Framework/Config/ClassDriver.php | 10 +- .../Framework/Config/ConfigurationDriver.php | 2 +- WebFiori/Framework/Config/Controller.php | 6 +- WebFiori/Framework/Config/JsonDriver.php | 4 +- WebFiori/Framework/DB.php | 12 +- WebFiori/Framework/EmailMessage.php | 4 +- .../ArrayIndexOutOfBoundsException.php | 2 +- .../Exceptions/InitializationException.php | 2 +- .../Exceptions/InvalidCRONExprException.php | 2 +- .../Exceptions/MissingLangException.php | 2 +- .../Exceptions/NoSuchThemeException.php | 2 +- .../Framework/Exceptions/RoutingException.php | 2 +- .../Framework/Exceptions/SessionException.php | 2 +- WebFiori/Framework/Exceptions/UIException.php | 2 +- .../Framework/ExtendedWebServicesManager.php | 6 +- .../Framework/Handlers/APICallErrHandler.php | 6 +- WebFiori/Framework/Handlers/CLIErrHandler.php | 6 +- .../Framework/Handlers/HTTPErrHandler.php | 8 +- WebFiori/Framework/Ini.php | 6 +- WebFiori/Framework/Lang.php | 6 +- .../Middleware/AbstractMiddleware.php | 2 +- .../Framework/Middleware/CacheMiddleware.php | 6 +- .../Middleware/MiddlewareManager.php | 2 +- .../Middleware/StartSessionMiddleware.php | 4 +- WebFiori/Framework/Privilege.php | 2 +- WebFiori/Framework/PrivilegesGroup.php | 2 +- WebFiori/Framework/Router/RouteOption.php | 2 +- WebFiori/Framework/Router/Router.php | 10 +- WebFiori/Framework/Router/RouterUri.php | 4 +- WebFiori/Framework/Scheduler/AbstractTask.php | 8 +- WebFiori/Framework/Scheduler/BaseTask.php | 2 +- WebFiori/Framework/Scheduler/TaskArgument.php | 2 +- .../Framework/Scheduler/TaskStatusEmail.php | 6 +- WebFiori/Framework/Scheduler/TasksManager.php | 22 +-- .../WebServices/ForceTaskExecutionService.php | 4 +- .../Scheduler/WebServices/GetTasksService.php | 4 +- .../WebServices/PrivateSchedulerService.php | 4 +- .../WebServices/SetupPasswordService.php | 6 +- .../WebServices/TasksLoginService.php | 6 +- .../WebServices/TasksLogoutService.php | 4 +- .../WebServices/TasksServicesManager.php | 2 +- .../Scheduler/WebUI/BaseTasksPage.php | 8 +- .../Scheduler/WebUI/ListTasksPage.php | 2 +- .../Scheduler/WebUI/SetPasswordPage.php | 4 +- .../Scheduler/WebUI/TasksLoginPage.php | 4 +- .../Framework/Scheduler/WebUI/TasksTable.php | 2 +- .../WebUI/templates/scheduler-head.php | 2 +- .../Session/DatabaseSessionStorage.php | 8 +- .../Session/DefaultSessionStorage.php | 4 +- .../Session/MSSQLSessionDataTable.php | 2 +- .../Framework/Session/MSSQLSessionsTable.php | 2 +- .../Session/MySQLSessionDataTable.php | 2 +- .../Framework/Session/MySQLSessionsTable.php | 2 +- WebFiori/Framework/Session/Session.php | 6 +- WebFiori/Framework/Session/SessionDB.php | 6 +- WebFiori/Framework/Session/SessionOption.php | 2 +- WebFiori/Framework/Session/SessionStatus.php | 2 +- WebFiori/Framework/Session/SessionStorage.php | 2 +- WebFiori/Framework/Session/SessionUser.php | 2 +- .../Framework/Session/SessionsManager.php | 8 +- WebFiori/Framework/Theme.php | 4 +- WebFiori/Framework/ThemeManager.php | 12 +- .../Framework/Ui/BeforeRenderCallback.php | 2 +- WebFiori/Framework/Ui/HTTPCodeView.php | 4 +- WebFiori/Framework/Ui/MessageBox.php | 6 +- .../Ui/ServerErrPage/ServerErrPage.php | 6 +- .../Ui/ServerErrPage/error-details.php | 2 +- .../Ui/ServerErrPage/server-err-head.php | 2 +- .../Ui/ServerErrPage/server-err-header.php | 2 +- .../ServerErrPage/server-err-stack-trace.php | 2 +- WebFiori/Framework/Ui/StarterPage.php | 10 +- WebFiori/Framework/Ui/WebPage.php | 30 ++-- WebFiori/Framework/Ui/ui-functions.php | 6 +- WebFiori/Framework/User.php | 4 +- WebFiori/Framework/Util.php | 6 +- .../Framework/Writers/APITestCaseWriter.php | 2 +- WebFiori/Framework/Writers/ClassWriter.php | 2 +- .../Framework/Writers/CommandClassWriter.php | 4 +- WebFiori/Framework/Writers/DBClassWriter.php | 4 +- .../Writers/DatabaseMigrationWriter.php | 2 +- .../Framework/Writers/LangClassWriter.php | 4 +- .../Writers/MiddlewareClassWriter.php | 8 +- .../Writers/SchedulerTaskClassWriter.php | 14 +- WebFiori/Framework/Writers/ServiceHolder.php | 2 +- .../Framework/Writers/TableClassWriter.php | 4 +- .../Framework/Writers/ThemeClassWriter.php | 4 +- .../Writers/ThemeComponentWriter.php | 2 +- .../Framework/Writers/WebServiceWriter.php | 4 +- composer.json | 4 +- public/index.php | 14 +- release-commit.php | 2 +- .../EmptyService/EmptyServicesManager.php | 2 +- tests/Apiss/Multiple/ServicesManager00.php | 2 +- tests/Apiss/Multiple/WebService00.php | 2 +- tests/Apiss/Multiple/WebService01.php | 2 +- tests/Tabless/EmployeeInfoTable.php | 2 +- tests/Tabless/PositionInfoTable.php | 2 +- tests/Tabless/Schema.php | 4 +- tests/Tabless/Schema2.php | 4 +- tests/Tabless/Schema3.php | 4 +- tests/Tabless/UserInfoTable.php | 2 +- tests/TestEntities/TestMiddleware.php | 2 +- tests/TestEntities/UserContactInfo.php | 4 +- tests/TestEntities/UserWithContact.php | 4 +- tests/TestEntities/UsersQuery.php | 4 +- tests/WebFiori/Benchmark/RouterBench.php | 4 +- tests/WebFiori/Framework/Tests/AccessTest.php | 8 +- .../Framework/Tests/ClassUtilTest.php | 6 +- .../Framework/Tests/Cli/AddCommandTest.php | 26 +-- .../Tests/Cli/CreateAPITestCaseTest.php | 48 ++--- .../Tests/Cli/CreateCLICommandTest.php | 10 +- .../Framework/Tests/Cli/CreateCommandTest.php | 10 +- .../Tests/Cli/CreateDBAccessTest.php | 46 ++--- .../Framework/Tests/Cli/CreateEntityTest.php | 24 +-- .../Tests/Cli/CreateMiddlewareTest.php | 28 +-- .../Tests/Cli/CreateMigrationTest.php | 8 +- .../Framework/Tests/Cli/CreateRESTTest.php | 116 ++++++------ .../Framework/Tests/Cli/CreateTableTest.php | 28 +-- .../Framework/Tests/Cli/CreateTaskTest.php | 48 ++--- .../Framework/Tests/Cli/CreateThemeTest.php | 16 +- .../Tests/Cli/CreateWebServiceTest.php | 28 +-- .../Tests/Cli/DBClassWritterTest.php | 26 +-- .../Framework/Tests/Cli/HelpCommandTest.php | 4 +- .../Tests/Cli/ListRoutesCommandTest.php | 12 +- .../Tests/Cli/ListThemesCommandTest.php | 10 +- .../Tests/Cli/RunMigrationsCommandTest.php | 8 +- .../Framework/Tests/Cli/RunSQLCommandTest.php | 24 +-- .../Tests/Cli/SchedulerCommandTest.php | 84 ++++----- .../Tests/Cli/SettingsCommandTest.php | 8 +- .../Tests/Cli/UpdateSettingsCommandTest.php | 66 +++---- .../Tests/Cli/UpdateTableCommandTest.php | 30 ++-- .../Tests/Cli/VersionCommandTest.php | 6 +- .../Framework/Tests/Config/JsonDriverTest.php | 4 +- tests/WebFiori/Framework/Tests/DBTest.php | 8 +- .../Framework/Tests/Langs/LanguageTest.php | 12 +- .../Framework/Tests/Mail/EmailMessageTest.php | 10 +- tests/WebFiori/Framework/Tests/PageTest.php | 20 +-- .../Framework/Tests/PrivilegeTest.php | 6 +- .../Framework/Tests/PrivilegesGroupTest.php | 6 +- .../WebFiori/Framework/Tests/ResponseTest.php | 2 +- .../Framework/Tests/Router/RouterTest.php | 10 +- .../Framework/Tests/Router/RouterUriTest.php | 8 +- .../Tests/Scheduler/JobArgumentTest.php | 4 +- .../Tests/Scheduler/SchedulerTaskTest.php | 14 +- .../Tests/Scheduler/SchedulerTest.php | 12 +- .../Framework/Tests/Session/SessionTest.php | 12 +- .../Tests/Session/SessionsManagerTest.php | 12 +- .../Framework/Tests/TestAutoLoader.php | 6 +- .../Framework/Tests/Theme/ThemeTest.php | 10 +- tests/WebFiori/Framework/Tests/UserTest.php | 8 +- tests/WebFiori/Framework/Tests/UtilTest.php | 6 +- .../Writers/BackgroundTaskWritterTest.php | 32 ++-- .../Writers/CLICommandClassWriterTest.php | 4 +- .../Writers/DatabaseMigrationWriterTest.php | 38 ++-- .../Tests/Writers/LangWritterTest.php | 8 +- .../Tests/Writers/MiddlewareWritterTest.php | 20 +-- .../Tests/Writers/TableWritterTest.php | 20 +-- .../Tests/Writers/ThemeWritterTest.php | 6 +- .../Writers/WebServiceTestCaseWriterTest.php | 10 +- .../Tests/Writers/WebServiceWritterTest.php | 10 +- tests/bootstrap.php | 25 +-- tests/phpunit.xml | 166 +++++++++--------- tests/phpunit10.xml | 166 +++++++++--------- 245 files changed, 1161 insertions(+), 1160 deletions(-) diff --git a/App/Apis/RoutingTestClass.php b/App/Apis/RoutingTestClass.php index 1c55d9453..f605ba9ee 100644 --- a/App/Apis/RoutingTestClass.php +++ b/App/Apis/RoutingTestClass.php @@ -1,5 +1,5 @@ 'Ibrahim Ali' + // 'WebFiori@example.com' => 'Ibrahim Ali' //]); } /** diff --git a/App/Tasks/Fail2TestTask.php b/App/Tasks/Fail2TestTask.php index c0d9dc9f1..c71ca727b 100644 --- a/App/Tasks/Fail2TestTask.php +++ b/App/Tasks/Fail2TestTask.php @@ -1,8 +1,8 @@ 'Ibrahim Ali' + // 'WebFiori@example.com' => 'Ibrahim Ali' //]); } /** diff --git a/App/Tasks/Fail3TestTask.php b/App/Tasks/Fail3TestTask.php index b4c5f0857..128dfa6fc 100644 --- a/App/Tasks/Fail3TestTask.php +++ b/App/Tasks/Fail3TestTask.php @@ -1,7 +1,7 @@ 'Ibrahim Ali' + // 'WebFiori@example.com' => 'Ibrahim Ali' //]); } /** diff --git a/App/Tasks/SuccessTestEveryMinute.php b/App/Tasks/SuccessTestEveryMinute.php index 0daf38164..2f51faa81 100644 --- a/App/Tasks/SuccessTestEveryMinute.php +++ b/App/Tasks/SuccessTestEveryMinute.php @@ -1,8 +1,8 @@ 'Ibrahim Ali' + // 'WebFiori@example.com' => 'Ibrahim Ali' //]); } /** diff --git a/App/Tasks/SuccessTestTask.php b/App/Tasks/SuccessTestTask.php index 339730e8c..96d7972a1 100644 --- a/App/Tasks/SuccessTestTask.php +++ b/App/Tasks/SuccessTestTask.php @@ -1,7 +1,7 @@ 'Ibrahim Ali' + // 'WebFiori@example.com' => 'Ibrahim Ali' //]); } /** diff --git a/Themes/FioriTheme/AsideSection.php b/Themes/FioriTheme/AsideSection.php index 7da8bbc13..5234e22d7 100644 --- a/Themes/FioriTheme/AsideSection.php +++ b/Themes/FioriTheme/AsideSection.php @@ -1,5 +1,5 @@ setBeforeStart(function (Runner $r) { $commands = [ - '\\webfiori\\framework\\cli\commands\\WHelpCommand', - '\\webfiori\\framework\\cli\\commands\\VersionCommand', - '\\webfiori\\framework\\cli\\commands\\SettingsCommand', - '\\webfiori\\framework\\cli\\commands\\SchedulerCommand', - '\\webfiori\\framework\\cli\\commands\\CreateCommand', - '\\webfiori\\framework\\cli\\commands\\AddCommand', - '\\webfiori\\framework\\cli\\commands\\ListRoutesCommand', - '\\webfiori\\framework\\cli\\commands\\ListThemesCommand', - '\\webfiori\\framework\\cli\\commands\\RunSQLQueryCommand', - '\\webfiori\\framework\\cli\\commands\\UpdateSettingsCommand', - '\\webfiori\\framework\\cli\\commands\\UpdateTableCommand', - '\\webfiori\\framework\\cli\\commands\\RunMigrationsCommand', + '\\WebFiori\\Framework\\Cli\commands\\WHelpCommand', + '\\WebFiori\\Framework\\Cli\\Commands\\VersionCommand', + '\\WebFiori\\Framework\\Cli\\Commands\\SettingsCommand', + '\\WebFiori\\Framework\\Cli\\Commands\\SchedulerCommand', + '\\WebFiori\\Framework\\Cli\\Commands\\CreateCommand', + '\\WebFiori\\Framework\\Cli\\Commands\\AddCommand', + '\\WebFiori\\Framework\\Cli\\Commands\\ListRoutesCommand', + '\\WebFiori\\Framework\\Cli\\Commands\\ListThemesCommand', + '\\WebFiori\\Framework\\Cli\\Commands\\RunSQLQueryCommand', + '\\WebFiori\\Framework\\Cli\\Commands\\UpdateSettingsCommand', + '\\WebFiori\\Framework\\Cli\\Commands\\UpdateTableCommand', + '\\WebFiori\\Framework\\Cli\\Commands\\RunMigrationsCommand', ]; foreach ($commands as $c) { @@ -548,16 +548,16 @@ private function checkAppDir() { */ private static function checkStandardLibs() { $standardLibsClasses = [ - 'webfiori/collections' => 'WebFiori\\Collections\\Node', - 'webfiori/ui' => 'WebFiori\\UI\\HTMLNode', - 'webfiori/jsonx' => 'WebFiori\\Json\\Json', - 'webfiori/database' => 'WebFiori\\Database\\ResultSet', - 'webfiori/http' => 'WebFiori\\Http\\Response', - 'webfiori/file' => 'WebFiori\\File\\File', - 'webfiori/mailer' => 'WebFiori\\Mail\\SMTPAccount', - 'webfiori/cli' => 'WebFiori\\Cli\\Command', - - 'webfiori/cache' => 'WebFiori\\Cache\\Cache' + 'WebFiori/collections' => 'WebFiori\\Collections\\Node', + 'WebFiori/ui' => 'WebFiori\\UI\\HTMLNode', + 'WebFiori/jsonx' => 'WebFiori\\Json\\Json', + 'WebFiori/database' => 'WebFiori\\Database\\ResultSet', + 'WebFiori/http' => 'WebFiori\\Http\\Response', + 'WebFiori/file' => 'WebFiori\\File\\File', + 'WebFiori/mailer' => 'WebFiori\\Mail\\SMTPAccount', + 'WebFiori/cli' => 'WebFiori\\Cli\\Command', + + 'WebFiori/cache' => 'WebFiori\\Cache\\Cache' ]; foreach ($standardLibsClasses as $lib => $class) { @@ -615,7 +615,7 @@ private static function initAutoLoader() { /** * Initialize autoloader. */ - if (!class_exists('webfiori\framework\autoload\ClassLoader',false)) { + if (!class_exists('WebFiori\framework\autoload\ClassLoader',false)) { $autoloader = WF_CORE_PATH.DIRECTORY_SEPARATOR.'autoload'.DIRECTORY_SEPARATOR.'ClassLoader.php'; require_once $autoloader; } diff --git a/WebFiori/Framework/Autoload/ClassInfo.php b/WebFiori/Framework/Autoload/ClassInfo.php index a54da9fff..b952a79ed 100644 --- a/WebFiori/Framework/Autoload/ClassInfo.php +++ b/WebFiori/Framework/Autoload/ClassInfo.php @@ -8,7 +8,7 @@ * https://github.com/WebFiori/.github/blob/main/LICENSE * */ -namespace webfiori\framework\autoload; +namespace WebFiori\Framework\Autoload; /** * A class that contains the names of indices that are used by loaded class info array. diff --git a/WebFiori/Framework/Autoload/ClassLoader.php b/WebFiori/Framework/Autoload/ClassLoader.php index 980e2f049..809b09dd3 100644 --- a/WebFiori/Framework/Autoload/ClassLoader.php +++ b/WebFiori/Framework/Autoload/ClassLoader.php @@ -8,7 +8,7 @@ * https://github.com/WebFiori/.github/blob/main/LICENSE * */ -namespace webfiori\framework\autoload; +namespace WebFiori\Framework\Autoload; use Exception; /** @@ -237,7 +237,7 @@ public static function get(array $options = [ $appFolder = APP_DIR; $frameworkSearchFolders = [ '', - $DS.'webfiori'.$DS.'framework', + $DS.'WebFiori'.$DS.'framework', $DS.'framework'.$DS.'exceptions', $DS.'framework'.$DS.'cli', $DS.'framework'.$DS.'ui', diff --git a/WebFiori/Framework/Autoload/ClassLoaderException.php b/WebFiori/Framework/Autoload/ClassLoaderException.php index 412f188c5..f45a27a37 100644 --- a/WebFiori/Framework/Autoload/ClassLoaderException.php +++ b/WebFiori/Framework/Autoload/ClassLoaderException.php @@ -8,7 +8,7 @@ * https://github.com/WebFiori/.github/blob/main/LICENSE * */ -namespace webfiori\framework\autoload; +namespace WebFiori\Framework\Autoload; use Exception; /** diff --git a/WebFiori/Framework/Cli/CLITestCase.php b/WebFiori/Framework/Cli/CLITestCase.php index 84ecf4c66..54305f9c1 100644 --- a/WebFiori/Framework/Cli/CLITestCase.php +++ b/WebFiori/Framework/Cli/CLITestCase.php @@ -8,12 +8,12 @@ * https://github.com/WebFiori/.github/blob/main/LICENSE * */ -namespace webfiori\framework\cli; +namespace WebFiori\Framework\Cli; use WebFiori\Cli\Command; use WebFiori\Cli\CommandTestCase; use WebFiori\File\File; -use webfiori\framework\App; +use WebFiori\Framework\App; /** * A base test case class that can be used to write command line commands test cases. diff --git a/WebFiori/Framework/Cli/CLIUtils.php b/WebFiori/Framework/Cli/CLIUtils.php index dc11d0416..31fefb8bf 100644 --- a/WebFiori/Framework/Cli/CLIUtils.php +++ b/WebFiori/Framework/Cli/CLIUtils.php @@ -1,11 +1,11 @@ queryOnSchema($schemaInst); } else { - $this->error('Given class is not an instance of "webfiori\\framework\\DB"!'); + $this->error('Given class is not an instance of "WebFiori\\Framework\\DB"!'); return -1; } diff --git a/WebFiori/Framework/Cli/Commands/SchedulerCommand.php b/WebFiori/Framework/Cli/Commands/SchedulerCommand.php index b3e901ff4..ca2f80ed3 100644 --- a/WebFiori/Framework/Cli/Commands/SchedulerCommand.php +++ b/WebFiori/Framework/Cli/Commands/SchedulerCommand.php @@ -8,12 +8,12 @@ * https://github.com/WebFiori/.github/blob/main/LICENSE * */ -namespace webfiori\framework\cli\commands; +namespace WebFiori\Framework\Cli\Commands; use WebFiori\Cli\Argument; use WebFiori\Cli\Command; -use webfiori\framework\scheduler\AbstractTask; -use webfiori\framework\scheduler\TasksManager; +use WebFiori\Framework\Scheduler\AbstractTask; +use WebFiori\Framework\Scheduler\TasksManager; /** * A CLI command which is related to executing * background tasks or performing operations on them. diff --git a/WebFiori/Framework/Cli/Commands/SettingsCommand.php b/WebFiori/Framework/Cli/Commands/SettingsCommand.php index ce9067a31..181f57a87 100644 --- a/WebFiori/Framework/Cli/Commands/SettingsCommand.php +++ b/WebFiori/Framework/Cli/Commands/SettingsCommand.php @@ -8,10 +8,10 @@ * https://github.com/WebFiori/.github/blob/main/LICENSE * */ -namespace webfiori\framework\cli\commands; +namespace WebFiori\Framework\Cli\Commands; use WebFiori\Cli\Command; -use webfiori\framework\App; +use WebFiori\Framework\App; /** * A CLI command which is used to show framework configuration. * diff --git a/WebFiori/Framework/Cli/Commands/UpdateSettingsCommand.php b/WebFiori/Framework/Cli/Commands/UpdateSettingsCommand.php index c34763101..e18f49122 100644 --- a/WebFiori/Framework/Cli/Commands/UpdateSettingsCommand.php +++ b/WebFiori/Framework/Cli/Commands/UpdateSettingsCommand.php @@ -8,16 +8,16 @@ * https://github.com/WebFiori/.github/blob/main/LICENSE * */ -namespace webfiori\framework\cli\commands; +namespace WebFiori\Framework\Cli\Commands; use Throwable; use WebFiori\Cli\Argument; use WebFiori\Cli\Command; use WebFiori\Cli\InputValidator; -use webfiori\framework\App; -use webfiori\framework\config\Controller; -use webfiori\framework\router\Router; -use webfiori\framework\Theme; +use WebFiori\Framework\App; +use WebFiori\Framework\Config\Controller; +use WebFiori\Framework\Router\Router; +use WebFiori\Framework\Theme; /** * This class implements a CLI command which is used to update the settings which are * stored in the class 'AppConfing' of the application. diff --git a/WebFiori/Framework/Cli/Commands/UpdateTableCommand.php b/WebFiori/Framework/Cli/Commands/UpdateTableCommand.php index a84009375..ad238f16c 100644 --- a/WebFiori/Framework/Cli/Commands/UpdateTableCommand.php +++ b/WebFiori/Framework/Cli/Commands/UpdateTableCommand.php @@ -8,13 +8,13 @@ * https://github.com/WebFiori/.github/blob/main/LICENSE * */ -namespace webfiori\framework\cli\commands; +namespace WebFiori\Framework\Cli\Commands; use WebFiori\Cli\Argument; use WebFiori\Cli\Command; -use webfiori\framework\cli\CLIUtils; -use webfiori\framework\cli\helpers\CreateTableObj; -use webfiori\framework\cli\helpers\TableObjHelper; +use WebFiori\Framework\Cli\CLIUtils; +use WebFiori\Framework\Cli\Helpers\CreateTableObj; +use WebFiori\Framework\Cli\Helpers\TableObjHelper; /** * A command which is used to update the properties of database table class. * diff --git a/WebFiori/Framework/Cli/Commands/VersionCommand.php b/WebFiori/Framework/Cli/Commands/VersionCommand.php index b395cf90c..3e9934c6f 100644 --- a/WebFiori/Framework/Cli/Commands/VersionCommand.php +++ b/WebFiori/Framework/Cli/Commands/VersionCommand.php @@ -8,7 +8,7 @@ * https://github.com/WebFiori/.github/blob/main/LICENSE * */ -namespace webfiori\framework\cli\commands; +namespace WebFiori\Framework\Cli\Commands; use WebFiori\Cli\Command; /** diff --git a/WebFiori/Framework/Cli/Commands/WHelpCommand.php b/WebFiori/Framework/Cli/Commands/WHelpCommand.php index a39a2f81b..b743fed15 100644 --- a/WebFiori/Framework/Cli/Commands/WHelpCommand.php +++ b/WebFiori/Framework/Cli/Commands/WHelpCommand.php @@ -8,7 +8,7 @@ * https://github.com/WebFiori/.github/blob/main/LICENSE * */ -namespace webfiori\framework\cli\commands; +namespace WebFiori\Framework\Cli\Commands; use WebFiori\Cli\commands\HelpCommand; /** diff --git a/WebFiori/Framework/Cli/Helpers/ClassInfoReader.php b/WebFiori/Framework/Cli/Helpers/ClassInfoReader.php index e8fa230ab..a40869c7c 100644 --- a/WebFiori/Framework/Cli/Helpers/ClassInfoReader.php +++ b/WebFiori/Framework/Cli/Helpers/ClassInfoReader.php @@ -8,12 +8,12 @@ * https://github.com/WebFiori/.github/blob/main/LICENSE * */ -namespace webfiori\framework\cli\helpers; +namespace WebFiori\Framework\Cli\Helpers; use InvalidArgumentException; use WebFiori\Cli\Command; -use webfiori\framework\cli\CLIUtils; -use webfiori\framework\Util; +use WebFiori\Framework\Cli\CLIUtils; +use WebFiori\Framework\Util; /** * A class which is used to read class information as prompt from any input stream * which is set by the class 'Runner'. diff --git a/WebFiori/Framework/Cli/Helpers/CreateAPITestCase.php b/WebFiori/Framework/Cli/Helpers/CreateAPITestCase.php index 56c90e156..64bc40721 100644 --- a/WebFiori/Framework/Cli/Helpers/CreateAPITestCase.php +++ b/WebFiori/Framework/Cli/Helpers/CreateAPITestCase.php @@ -8,10 +8,10 @@ * https://github.com/WebFiori/.github/blob/main/LICENSE * */ -namespace webfiori\framework\cli\helpers; +namespace WebFiori\Framework\Cli\Helpers; -use webfiori\framework\cli\commands\CreateCommand; -use webfiori\framework\writers\APITestCaseWriter; +use WebFiori\Framework\Cli\Commands\CreateCommand; +use WebFiori\Framework\Writers\APITestCaseWriter; use WebFiori\Http\WebServicesManager; /** * A helper class which is used to help in creating test cases for web APIs classes using CLI. diff --git a/WebFiori/Framework/Cli/Helpers/CreateBackgroundTask.php b/WebFiori/Framework/Cli/Helpers/CreateBackgroundTask.php index 1888aa0da..5eeda1add 100644 --- a/WebFiori/Framework/Cli/Helpers/CreateBackgroundTask.php +++ b/WebFiori/Framework/Cli/Helpers/CreateBackgroundTask.php @@ -8,14 +8,14 @@ * https://github.com/WebFiori/.github/blob/main/LICENSE * */ -namespace webfiori\framework\cli\helpers; +namespace WebFiori\Framework\Cli\Helpers; use InvalidArgumentException; use WebFiori\Cli\InputValidator; -use webfiori\framework\cli\commands\CreateCommand; -use webfiori\framework\scheduler\BaseTask; -use webfiori\framework\scheduler\TaskArgument; -use webfiori\framework\writers\SchedulerTaskClassWriter; +use WebFiori\Framework\Cli\Commands\CreateCommand; +use WebFiori\Framework\Scheduler\BaseTask; +use WebFiori\Framework\Scheduler\TaskArgument; +use WebFiori\Framework\Writers\SchedulerTaskClassWriter; /** * A helper class which is used to help in creating scheduler tasks classes using CLI. * diff --git a/WebFiori/Framework/Cli/Helpers/CreateCLIClassHelper.php b/WebFiori/Framework/Cli/Helpers/CreateCLIClassHelper.php index 7557d1aa0..688803a01 100644 --- a/WebFiori/Framework/Cli/Helpers/CreateCLIClassHelper.php +++ b/WebFiori/Framework/Cli/Helpers/CreateCLIClassHelper.php @@ -8,11 +8,11 @@ * https://github.com/WebFiori/.github/blob/main/LICENSE * */ -namespace webfiori\framework\cli\helpers; +namespace WebFiori\Framework\Cli\Helpers; use WebFiori\Cli\InputValidator; -use webfiori\framework\cli\commands\CreateCommand; -use webfiori\framework\writers\CommandClassWriter; +use WebFiori\Framework\Cli\Commands\CreateCommand; +use WebFiori\Framework\Writers\CommandClassWriter; /** * A helper class which is used to help in creating CLI command classes using CLI. * diff --git a/WebFiori/Framework/Cli/Helpers/CreateClassHelper.php b/WebFiori/Framework/Cli/Helpers/CreateClassHelper.php index be0024db6..46ecbeaed 100644 --- a/WebFiori/Framework/Cli/Helpers/CreateClassHelper.php +++ b/WebFiori/Framework/Cli/Helpers/CreateClassHelper.php @@ -8,12 +8,12 @@ * https://github.com/WebFiori/.github/blob/main/LICENSE * */ -namespace webfiori\framework\cli\helpers; +namespace WebFiori\Framework\Cli\Helpers; use WebFiori\Cli\Command; use WebFiori\Cli\InputValidator; -use webfiori\framework\cli\commands\CreateCommand; -use webfiori\framework\writers\ClassWriter; +use WebFiori\Framework\Cli\Commands\CreateCommand; +use WebFiori\Framework\Writers\ClassWriter; /** * A wrapper class which helps in creating classes using CLI. * diff --git a/WebFiori/Framework/Cli/Helpers/CreateDBAccessHelper.php b/WebFiori/Framework/Cli/Helpers/CreateDBAccessHelper.php index 5d8770220..963805677 100644 --- a/WebFiori/Framework/Cli/Helpers/CreateDBAccessHelper.php +++ b/WebFiori/Framework/Cli/Helpers/CreateDBAccessHelper.php @@ -8,12 +8,12 @@ * https://github.com/WebFiori/.github/blob/main/LICENSE * */ -namespace webfiori\framework\cli\helpers; +namespace WebFiori\Framework\Cli\Helpers; use WebFiori\Database\Table; -use webfiori\framework\App; -use webfiori\framework\cli\commands\CreateCommand; -use webfiori\framework\writers\DBClassWriter; +use WebFiori\Framework\App; +use WebFiori\Framework\Cli\Commands\CreateCommand; +use WebFiori\Framework\Writers\DBClassWriter; /** * Description of CreateDBAccessHelper diff --git a/WebFiori/Framework/Cli/Helpers/CreateFullRESTHelper.php b/WebFiori/Framework/Cli/Helpers/CreateFullRESTHelper.php index d9333e3b3..7f67c056e 100644 --- a/WebFiori/Framework/Cli/Helpers/CreateFullRESTHelper.php +++ b/WebFiori/Framework/Cli/Helpers/CreateFullRESTHelper.php @@ -8,20 +8,20 @@ * https://github.com/WebFiori/.github/blob/main/LICENSE * */ -namespace webfiori\framework\cli\helpers; +namespace WebFiori\Framework\Cli\Helpers; use WebFiori\Database\ConnectionInfo; use WebFiori\Database\MsSql\MSSQLTable; use WebFiori\Database\MySql\MySQLTable; use WebFiori\Database\Table; -use webfiori\framework\cli\CLIUtils; -use webfiori\framework\writers\DBClassWriter; -use webfiori\framework\writers\ServiceHolder; -use webfiori\framework\writers\TableClassWriter; -use webfiori\framework\writers\WebServiceWriter; +use WebFiori\Framework\Cli\CLIUtils; +use WebFiori\Framework\Writers\DBClassWriter; +use WebFiori\Framework\Writers\ServiceHolder; +use WebFiori\Framework\Writers\TableClassWriter; +use WebFiori\Framework\Writers\WebServiceWriter; use WebFiori\Json\Json; /** - * A helper class for creating database tables classes. + * A helper class for creating database Tables classes. * * @author Ibrahim */ diff --git a/WebFiori/Framework/Cli/Helpers/CreateMiddleware.php b/WebFiori/Framework/Cli/Helpers/CreateMiddleware.php index ae3698501..49db8bee4 100644 --- a/WebFiori/Framework/Cli/Helpers/CreateMiddleware.php +++ b/WebFiori/Framework/Cli/Helpers/CreateMiddleware.php @@ -8,11 +8,11 @@ * https://github.com/WebFiori/.github/blob/main/LICENSE * */ -namespace webfiori\framework\cli\helpers; +namespace WebFiori\Framework\Cli\Helpers; use WebFiori\Cli\InputValidator; -use webfiori\framework\cli\commands\CreateCommand; -use webfiori\framework\writers\MiddlewareClassWriter; +use WebFiori\Framework\Cli\Commands\CreateCommand; +use WebFiori\Framework\Writers\MiddlewareClassWriter; /** * A helper class that works with the create command to create a middleware. * diff --git a/WebFiori/Framework/Cli/Helpers/CreateMigration.php b/WebFiori/Framework/Cli/Helpers/CreateMigration.php index a50d8f7b8..f433de140 100644 --- a/WebFiori/Framework/Cli/Helpers/CreateMigration.php +++ b/WebFiori/Framework/Cli/Helpers/CreateMigration.php @@ -8,12 +8,12 @@ * https://github.com/WebFiori/.github/blob/main/LICENSE * */ -namespace webfiori\framework\cli\helpers; +namespace WebFiori\Framework\Cli\Helpers; use WebFiori\Database\Schema\SchemaRunner; -use webfiori\framework\cli\CLIUtils; -use webfiori\framework\cli\commands\CreateCommand; -use webfiori\framework\writers\DatabaseMigrationWriter; +use WebFiori\Framework\Cli\CLIUtils; +use WebFiori\Framework\Cli\Commands\CreateCommand; +use WebFiori\Framework\Writers\DatabaseMigrationWriter; /** * A helper class which is used to help in creating scheduler tasks classes using CLI. * diff --git a/WebFiori/Framework/Cli/Helpers/CreateTableObj.php b/WebFiori/Framework/Cli/Helpers/CreateTableObj.php index a0df9f673..aa7a3960e 100644 --- a/WebFiori/Framework/Cli/Helpers/CreateTableObj.php +++ b/WebFiori/Framework/Cli/Helpers/CreateTableObj.php @@ -8,17 +8,17 @@ * https://github.com/WebFiori/.github/blob/main/LICENSE * */ -namespace webfiori\framework\cli\helpers; +namespace WebFiori\Framework\Cli\Helpers; use WebFiori\Cli\Command; use WebFiori\Database\ConnectionInfo; use WebFiori\Database\MsSql\MSSQLTable; use WebFiori\Database\MySql\MySQLTable; -use webfiori\framework\cli\commands\CreateCommand; -use webfiori\framework\writers\TableClassWriter; +use WebFiori\Framework\Cli\Commands\CreateCommand; +use WebFiori\Framework\Writers\TableClassWriter; use WebFiori\Json\CaseConverter; /** - * A helper class for creating database tables classes. + * A helper class for creating database Tables classes. * * @author Ibrahim */ diff --git a/WebFiori/Framework/Cli/Helpers/CreateThemeHelper.php b/WebFiori/Framework/Cli/Helpers/CreateThemeHelper.php index be3663dae..9c2248a13 100644 --- a/WebFiori/Framework/Cli/Helpers/CreateThemeHelper.php +++ b/WebFiori/Framework/Cli/Helpers/CreateThemeHelper.php @@ -8,10 +8,10 @@ * https://github.com/WebFiori/.github/blob/main/LICENSE * */ -namespace webfiori\framework\cli\helpers; +namespace WebFiori\Framework\Cli\Helpers; -use webfiori\framework\cli\commands\CreateCommand; -use webfiori\framework\writers\ThemeClassWriter; +use WebFiori\Framework\Cli\Commands\CreateCommand; +use WebFiori\Framework\Writers\ThemeClassWriter; /** * Description of CreateTheme * diff --git a/WebFiori/Framework/Cli/Helpers/CreateWebService.php b/WebFiori/Framework/Cli/Helpers/CreateWebService.php index 1fcb6e992..b49acf925 100644 --- a/WebFiori/Framework/Cli/Helpers/CreateWebService.php +++ b/WebFiori/Framework/Cli/Helpers/CreateWebService.php @@ -8,11 +8,11 @@ * https://github.com/WebFiori/.github/blob/main/LICENSE * */ -namespace webfiori\framework\cli\helpers; +namespace WebFiori\Framework\Cli\Helpers; -use webfiori\framework\cli\commands\CreateCommand; -use webfiori\framework\writers\ServiceHolder; -use webfiori\framework\writers\WebServiceWriter; +use WebFiori\Framework\Cli\Commands\CreateCommand; +use WebFiori\Framework\Writers\ServiceHolder; +use WebFiori\Framework\Writers\WebServiceWriter; use WebFiori\Http\ParamType; use WebFiori\Http\RequestMethod; use WebFiori\Http\RequestParameter; diff --git a/WebFiori/Framework/Cli/Helpers/TableObjHelper.php b/WebFiori/Framework/Cli/Helpers/TableObjHelper.php index 5cd70a1e9..411dc0478 100644 --- a/WebFiori/Framework/Cli/Helpers/TableObjHelper.php +++ b/WebFiori/Framework/Cli/Helpers/TableObjHelper.php @@ -8,7 +8,7 @@ * https://github.com/WebFiori/.github/blob/main/LICENSE * */ -namespace webfiori\framework\cli\helpers; +namespace WebFiori\Framework\Cli\Helpers; use Throwable; use WebFiori\Cli\Command; @@ -18,9 +18,9 @@ use WebFiori\Database\MySql\MySQLColumn; use WebFiori\Database\MySql\MySQLTable; use WebFiori\Database\Table; -use webfiori\framework\App; -use webfiori\framework\cli\commands\UpdateTableCommand; -use webfiori\framework\DB; +use WebFiori\Framework\App; +use WebFiori\Framework\Cli\Commands\UpdateTableCommand; +use WebFiori\Framework\DB; /** * A CLI class helper which has methods to help in creating and diff --git a/WebFiori/Framework/Config/ClassDriver.php b/WebFiori/Framework/Config/ClassDriver.php index 7d63becfa..0757cd1a5 100644 --- a/WebFiori/Framework/Config/ClassDriver.php +++ b/WebFiori/Framework/Config/ClassDriver.php @@ -1,11 +1,11 @@ translation; } /** - * Auto-register services tables which exist on a specific directory. + * Auto-register services Tables which exist on a specific directory. * * The classes which represents web services must be suffixed * with the word 'Service' in order to register them (e.g. RegisterUserService). diff --git a/WebFiori/Framework/Handlers/APICallErrHandler.php b/WebFiori/Framework/Handlers/APICallErrHandler.php index b32bed9ee..50db4ba3a 100644 --- a/WebFiori/Framework/Handlers/APICallErrHandler.php +++ b/WebFiori/Framework/Handlers/APICallErrHandler.php @@ -8,11 +8,11 @@ * https://github.com/WebFiori/.github/blob/main/LICENSE * */ -namespace webfiori\framework\handlers; +namespace WebFiori\Framework\Handlers; use WebFiori\Error\AbstractHandler; -use webfiori\framework\App; -use webfiori\framework\router\Router; +use WebFiori\Framework\App; +use WebFiori\Framework\Router\Router; use WebFiori\Http\Request; use WebFiori\Http\Response; use WebFiori\Json\Json; diff --git a/WebFiori/Framework/Handlers/CLIErrHandler.php b/WebFiori/Framework/Handlers/CLIErrHandler.php index d3ec23de3..8014afbe6 100644 --- a/WebFiori/Framework/Handlers/CLIErrHandler.php +++ b/WebFiori/Framework/Handlers/CLIErrHandler.php @@ -8,13 +8,13 @@ * https://github.com/WebFiori/.github/blob/main/LICENSE * */ -namespace webfiori\framework\handlers; +namespace WebFiori\Framework\Handlers; use WebFiori\Cli\Formatter; use WebFiori\Cli\Runner; use WebFiori\Error\AbstractHandler; -use webfiori\framework\App; -use webfiori\framework\scheduler\TasksManager; +use WebFiori\Framework\App; +use WebFiori\Framework\Scheduler\TasksManager; /** * Exceptions handler which is used to handle exceptions in case of running * CLI applications. diff --git a/WebFiori/Framework/Handlers/HTTPErrHandler.php b/WebFiori/Framework/Handlers/HTTPErrHandler.php index 49834d1fc..30e0dfbfc 100644 --- a/WebFiori/Framework/Handlers/HTTPErrHandler.php +++ b/WebFiori/Framework/Handlers/HTTPErrHandler.php @@ -8,12 +8,12 @@ * https://github.com/WebFiori/.github/blob/main/LICENSE * */ -namespace webfiori\framework\handlers; +namespace WebFiori\Framework\Handlers; use WebFiori\Error\AbstractHandler; -use webfiori\framework\App; -use webfiori\framework\router\Router; -use webfiori\framework\ui\serverErrPage\ServerErrPage; +use WebFiori\Framework\App; +use WebFiori\Framework\Router\Router; +use WebFiori\Framework\UI\ServerErrPage\ServerErrPage; use WebFiori\Http\Request; use WebFiori\Http\Response; /** diff --git a/WebFiori/Framework/Ini.php b/WebFiori/Framework/Ini.php index c5b7e20a8..86cf53caf 100644 --- a/WebFiori/Framework/Ini.php +++ b/WebFiori/Framework/Ini.php @@ -8,11 +8,11 @@ * https://github.com/WebFiori/.github/blob/main/LICENSE * */ -namespace webfiori\framework; +namespace WebFiori\Framework; use WebFiori\File\exceptions\FileException; use WebFiori\File\File; -use webfiori\framework\config\ClassDriver; +use WebFiori\Framework\Config\ClassDriver; use WebFiori\Json\Json; /** * A class which is used to create application initialization classes. @@ -123,7 +123,7 @@ public function createRoutesClass(string $className) { ClassDriver::a($cFile, ""); ClassDriver::a($cFile, "namespace ".APP_DIR."\\ini\\routes;"); ClassDriver::a($cFile, ""); - ClassDriver::a($cFile, "use webfiori\\framework\\router\\Router;"); + ClassDriver::a($cFile, "use WebFiori\\Framework\\Router\\Router;"); ClassDriver::a($cFile, ""); ClassDriver::a($cFile, "class $className {"); ClassDriver::a($cFile, $this->docStart, 1); diff --git a/WebFiori/Framework/Lang.php b/WebFiori/Framework/Lang.php index aa4ed3576..af83c2493 100644 --- a/WebFiori/Framework/Lang.php +++ b/WebFiori/Framework/Lang.php @@ -8,10 +8,10 @@ * https://github.com/WebFiori/.github/blob/main/LICENSE * */ -namespace webfiori\framework; +namespace WebFiori\Framework; -use webfiori\framework\exceptions\MissingLangException; -use webfiori\framework\session\SessionsManager; +use WebFiori\Framework\Exceptions\MissingLangException; +use WebFiori\Framework\Session\SessionsManager; use WebFiori\Http\Request; /** diff --git a/WebFiori/Framework/Middleware/AbstractMiddleware.php b/WebFiori/Framework/Middleware/AbstractMiddleware.php index 8f26b6be8..4a5d0b138 100644 --- a/WebFiori/Framework/Middleware/AbstractMiddleware.php +++ b/WebFiori/Framework/Middleware/AbstractMiddleware.php @@ -8,7 +8,7 @@ * https://github.com/WebFiori/.github/blob/main/LICENSE * */ -namespace webfiori\framework\middleware; +namespace WebFiori\Framework\Middleware; use WebFiori\Collections\Comparable; use WebFiori\Http\Request; diff --git a/WebFiori/Framework/Middleware/CacheMiddleware.php b/WebFiori/Framework/Middleware/CacheMiddleware.php index 4dc4572de..696a6592c 100644 --- a/WebFiori/Framework/Middleware/CacheMiddleware.php +++ b/WebFiori/Framework/Middleware/CacheMiddleware.php @@ -1,10 +1,10 @@ * * * * * /usr/bin/php path/to/webfiori --scheduler check p=<password>

+ *

* * * * * /usr/bin/php path/to/WebFiori --scheduler check p=<password>

* Where <password> is the password * that was set by the developer to protect the tasks from unauthorized access. * If no password is set, then it can be removed from the command. diff --git a/WebFiori/Framework/Scheduler/WebServices/ForceTaskExecutionService.php b/WebFiori/Framework/Scheduler/WebServices/ForceTaskExecutionService.php index 55614882f..97484a268 100644 --- a/WebFiori/Framework/Scheduler/WebServices/ForceTaskExecutionService.php +++ b/WebFiori/Framework/Scheduler/WebServices/ForceTaskExecutionService.php @@ -8,9 +8,9 @@ * https://github.com/WebFiori/.github/blob/main/LICENSE * */ -namespace webfiori\framework\scheduler\webServices; +namespace WebFiori\Framework\Scheduler\WebServices; -use webfiori\framework\scheduler\TasksManager; +use WebFiori\Framework\Scheduler\TasksManager; use WebFiori\Http\RequestParameter; use WebFiori\Http\WebServicesManager; use WebFiori\Json\Json; diff --git a/WebFiori/Framework/Scheduler/WebServices/GetTasksService.php b/WebFiori/Framework/Scheduler/WebServices/GetTasksService.php index e8f7b5e52..a338cda21 100644 --- a/WebFiori/Framework/Scheduler/WebServices/GetTasksService.php +++ b/WebFiori/Framework/Scheduler/WebServices/GetTasksService.php @@ -8,9 +8,9 @@ * https://github.com/WebFiori/.github/blob/main/LICENSE * */ -namespace webfiori\framework\scheduler\webServices; +namespace WebFiori\Framework\Scheduler\WebServices; -use webfiori\framework\scheduler\TasksManager; +use WebFiori\Framework\Scheduler\TasksManager; use WebFiori\Json\Json; /** * A web service which is used to fetch a list of all scheduled tasks. diff --git a/WebFiori/Framework/Scheduler/WebServices/PrivateSchedulerService.php b/WebFiori/Framework/Scheduler/WebServices/PrivateSchedulerService.php index d9e2b3f37..09ebe6eb5 100644 --- a/WebFiori/Framework/Scheduler/WebServices/PrivateSchedulerService.php +++ b/WebFiori/Framework/Scheduler/WebServices/PrivateSchedulerService.php @@ -1,7 +1,7 @@ getDocument()->getBody()->addChild('script', [ 'type' => 'text/javascript', - 'src' => 'https://cdn.jsdelivr.net/gh/webfiori/framework@'.WF_VERSION.'/assets/js/scheduler-logic.js', + 'src' => 'https://cdn.jsdelivr.net/gh/WebFiori/framework@'.WF_VERSION.'/assets/js/scheduler-logic.js', ]); }); } diff --git a/WebFiori/Framework/Scheduler/WebUI/ListTasksPage.php b/WebFiori/Framework/Scheduler/WebUI/ListTasksPage.php index 6a326834d..5117fdcf3 100644 --- a/WebFiori/Framework/Scheduler/WebUI/ListTasksPage.php +++ b/WebFiori/Framework/Scheduler/WebUI/ListTasksPage.php @@ -8,7 +8,7 @@ * https://github.com/WebFiori/.github/blob/main/LICENSE * */ -namespace webfiori\framework\scheduler\webUI; +namespace WebFiori\Framework\Scheduler\WebUI; use WebFiori\File\File; use WebFiori\Http\Response; diff --git a/WebFiori/Framework/Scheduler/WebUI/SetPasswordPage.php b/WebFiori/Framework/Scheduler/WebUI/SetPasswordPage.php index 8fe6dcf5e..8b8741119 100644 --- a/WebFiori/Framework/Scheduler/WebUI/SetPasswordPage.php +++ b/WebFiori/Framework/Scheduler/WebUI/SetPasswordPage.php @@ -1,7 +1,7 @@ diff --git a/WebFiori/Framework/Session/DatabaseSessionStorage.php b/WebFiori/Framework/Session/DatabaseSessionStorage.php index eec797eb6..daf0a1f43 100644 --- a/WebFiori/Framework/Session/DatabaseSessionStorage.php +++ b/WebFiori/Framework/Session/DatabaseSessionStorage.php @@ -8,10 +8,10 @@ * https://github.com/WebFiori/.github/blob/main/LICENSE * */ -namespace webfiori\framework\session; +namespace WebFiori\Framework\Session; use WebFiori\Database\DatabaseException; -use webfiori\framework\exceptions\SessionException; +use WebFiori\Framework\Exceptions\SessionException; /** * A session storage engine which uses database to store session state. @@ -47,9 +47,9 @@ public function __construct() { } } /** - * Drop the tables which are used to store session information. + * Drop the Tables which are used to store session information. * - * The method will drop two tables, the table 'session_data' and the + * The method will drop two Tables, the table 'session_data' and the * table 'sessions'. */ public function dropTables() { diff --git a/WebFiori/Framework/Session/DefaultSessionStorage.php b/WebFiori/Framework/Session/DefaultSessionStorage.php index d379e44e5..496116b25 100644 --- a/WebFiori/Framework/Session/DefaultSessionStorage.php +++ b/WebFiori/Framework/Session/DefaultSessionStorage.php @@ -8,12 +8,12 @@ * https://github.com/WebFiori/.github/blob/main/LICENSE * */ -namespace webfiori\framework\session; +namespace WebFiori\Framework\Session; use WebFiori\Cli\Runner; use WebFiori\File\exceptions\FileException; use WebFiori\File\File; -use webfiori\framework\exceptions\SessionException; +use WebFiori\Framework\Exceptions\SessionException; /** * The default sessions storage engine. * diff --git a/WebFiori/Framework/Session/MSSQLSessionDataTable.php b/WebFiori/Framework/Session/MSSQLSessionDataTable.php index 73d4d01fc..6d6d322a5 100644 --- a/WebFiori/Framework/Session/MSSQLSessionDataTable.php +++ b/WebFiori/Framework/Session/MSSQLSessionDataTable.php @@ -8,7 +8,7 @@ * https://github.com/WebFiori/.github/blob/main/LICENSE * */ -namespace webfiori\framework\session; +namespace WebFiori\Framework\Session; use WebFiori\Database\MsSql\MSSQLTable; diff --git a/WebFiori/Framework/Session/MSSQLSessionsTable.php b/WebFiori/Framework/Session/MSSQLSessionsTable.php index 6e6fcee3c..db7504239 100644 --- a/WebFiori/Framework/Session/MSSQLSessionsTable.php +++ b/WebFiori/Framework/Session/MSSQLSessionsTable.php @@ -8,7 +8,7 @@ * https://github.com/WebFiori/.github/blob/main/LICENSE * */ -namespace webfiori\framework\session; +namespace WebFiori\Framework\Session; use WebFiori\Database\MsSql\MSSQLTable; /** diff --git a/WebFiori/Framework/Session/MySQLSessionDataTable.php b/WebFiori/Framework/Session/MySQLSessionDataTable.php index 2413bc4a1..7ca18429f 100644 --- a/WebFiori/Framework/Session/MySQLSessionDataTable.php +++ b/WebFiori/Framework/Session/MySQLSessionDataTable.php @@ -8,7 +8,7 @@ * https://github.com/WebFiori/.github/blob/main/LICENSE * */ -namespace webfiori\framework\session; +namespace WebFiori\Framework\Session; use WebFiori\Database\MySql\MySQLTable; diff --git a/WebFiori/Framework/Session/MySQLSessionsTable.php b/WebFiori/Framework/Session/MySQLSessionsTable.php index a7ab4f303..0d36515c8 100644 --- a/WebFiori/Framework/Session/MySQLSessionsTable.php +++ b/WebFiori/Framework/Session/MySQLSessionsTable.php @@ -8,7 +8,7 @@ * https://github.com/WebFiori/.github/blob/main/LICENSE * */ -namespace webfiori\framework\session; +namespace WebFiori\Framework\Session; use WebFiori\Database\MySql\MySQLTable; diff --git a/WebFiori/Framework/Session/Session.php b/WebFiori/Framework/Session/Session.php index adae7c5b1..6aac552c3 100644 --- a/WebFiori/Framework/Session/Session.php +++ b/WebFiori/Framework/Session/Session.php @@ -8,10 +8,10 @@ * https://github.com/WebFiori/.github/blob/main/LICENSE * */ -namespace webfiori\framework\session; +namespace WebFiori\Framework\Session; -use webfiori\framework\App; -use webfiori\framework\exceptions\SessionException; +use WebFiori\Framework\App; +use WebFiori\Framework\Exceptions\SessionException; use WebFiori\Http\HttpCookie; use WebFiori\Http\Request; use WebFiori\Json\Json; diff --git a/WebFiori/Framework/Session/SessionDB.php b/WebFiori/Framework/Session/SessionDB.php index f3bcd5948..792ddd75c 100644 --- a/WebFiori/Framework/Session/SessionDB.php +++ b/WebFiori/Framework/Session/SessionDB.php @@ -8,10 +8,10 @@ * https://github.com/WebFiori/.github/blob/main/LICENSE * */ -namespace webfiori\framework\session; +namespace WebFiori\Framework\Session; use WebFiori\Database\DatabaseException; -use webfiori\framework\DB; +use WebFiori\Framework\DB; /** * A class which includes all database related operations to add, update, * and delete sessions from a database. @@ -155,7 +155,7 @@ public function removeSession(string $sId) { $this->table('sessions')->delete()->where('s-id', $sId)->execute(); } /** - * Removes database tables which are used to store session information. + * Removes database Tables which are used to store session information. */ public function removeTables() { $this->transaction(function (DB $db) diff --git a/WebFiori/Framework/Session/SessionOption.php b/WebFiori/Framework/Session/SessionOption.php index a78065346..a7953a634 100644 --- a/WebFiori/Framework/Session/SessionOption.php +++ b/WebFiori/Framework/Session/SessionOption.php @@ -8,7 +8,7 @@ * https://github.com/WebFiori/.github/blob/main/LICENSE * */ -namespace webfiori\framework\session; +namespace WebFiori\Framework\Session; /** * A class which is used to hold the options names that are supported during diff --git a/WebFiori/Framework/Session/SessionStatus.php b/WebFiori/Framework/Session/SessionStatus.php index 460037183..bb4a840f4 100644 --- a/WebFiori/Framework/Session/SessionStatus.php +++ b/WebFiori/Framework/Session/SessionStatus.php @@ -8,7 +8,7 @@ * https://github.com/WebFiori/.github/blob/main/LICENSE * */ -namespace webfiori\framework\session; +namespace WebFiori\Framework\Session; /** * A class which is used to hold constants which represents different statuses diff --git a/WebFiori/Framework/Session/SessionStorage.php b/WebFiori/Framework/Session/SessionStorage.php index 3ce1085ca..9a106d4da 100644 --- a/WebFiori/Framework/Session/SessionStorage.php +++ b/WebFiori/Framework/Session/SessionStorage.php @@ -8,7 +8,7 @@ * https://github.com/WebFiori/.github/blob/main/LICENSE * */ -namespace webfiori\framework\session; +namespace WebFiori\Framework\Session; /** * An interface which can be used to implement different types of sessions storage. diff --git a/WebFiori/Framework/Session/SessionUser.php b/WebFiori/Framework/Session/SessionUser.php index 45759f167..198a95665 100644 --- a/WebFiori/Framework/Session/SessionUser.php +++ b/WebFiori/Framework/Session/SessionUser.php @@ -8,7 +8,7 @@ * https://github.com/WebFiori/.github/blob/main/LICENSE * */ -namespace webfiori\framework\session; +namespace WebFiori\Framework\Session; /** * An interface which is used to tell if an entity can represents session diff --git a/WebFiori/Framework/Session/SessionsManager.php b/WebFiori/Framework/Session/SessionsManager.php index 929843086..b67cd53e3 100644 --- a/WebFiori/Framework/Session/SessionsManager.php +++ b/WebFiori/Framework/Session/SessionsManager.php @@ -8,9 +8,9 @@ * https://github.com/WebFiori/.github/blob/main/LICENSE * */ -namespace webfiori\framework\session; +namespace WebFiori\Framework\Session; -use webfiori\framework\exceptions\SessionException; +use WebFiori\Framework\Exceptions\SessionException; use WebFiori\Http\Request; /** * A class which is used to manage user sessions. @@ -65,10 +65,10 @@ private function __construct() { $constructor = WF_SESSION_STORAGE.''; $classObj = new $constructor(); - if (is_subclass_of($classObj, '\webfiori\framework\session\SessionStorage')) { + if (is_subclass_of($classObj, '\WebFiori\framework\session\SessionStorage')) { $this->sessionStorage = $classObj; } else { - throw new SessionException('The class "'.WF_SESSION_STORAGE.'" does not implement "\webfiori\framework\session\SessionStorage".'); + throw new SessionException('The class "'.WF_SESSION_STORAGE.'" does not implement "\WebFiori\framework\session\SessionStorage".'); } } diff --git a/WebFiori/Framework/Theme.php b/WebFiori/Framework/Theme.php index 930c13e4a..2fa685c0b 100644 --- a/WebFiori/Framework/Theme.php +++ b/WebFiori/Framework/Theme.php @@ -8,10 +8,10 @@ * https://github.com/WebFiori/.github/blob/main/LICENSE * */ -namespace webfiori\framework; +namespace WebFiori\Framework; use ReflectionClass; -use webfiori\framework\ui\WebPage; +use WebFiori\Framework\UI\WebPage; use WebFiori\Json\Json; use WebFiori\Json\JsonI; use WebFiori\UI\exceptions\InvalidNodeNameException; diff --git a/WebFiori/Framework/ThemeManager.php b/WebFiori/Framework/ThemeManager.php index 05758292d..527208bd8 100644 --- a/WebFiori/Framework/ThemeManager.php +++ b/WebFiori/Framework/ThemeManager.php @@ -8,15 +8,15 @@ * https://github.com/WebFiori/.github/blob/main/LICENSE * */ -namespace webfiori\framework; +namespace WebFiori\Framework; use Error; use Exception; -use webfiori\file\File; -use webfiori\framework\exceptions\NoSuchThemeException; -use webfiori\framework\router\RouteOption; -use webfiori\framework\router\Router; -use webfiori\http\Response; +use WebFiori\file\File; +use WebFiori\Framework\Exceptions\NoSuchThemeException; +use WebFiori\Framework\Router\RouteOption; +use WebFiori\Framework\Router\Router; +use WebFiori\http\Response; /** * A class which manages theme registration and loading. diff --git a/WebFiori/Framework/Ui/BeforeRenderCallback.php b/WebFiori/Framework/Ui/BeforeRenderCallback.php index f381feaed..106bea5b2 100644 --- a/WebFiori/Framework/Ui/BeforeRenderCallback.php +++ b/WebFiori/Framework/Ui/BeforeRenderCallback.php @@ -8,7 +8,7 @@ * https://github.com/WebFiori/.github/blob/main/LICENSE * */ -namespace webfiori\framework\ui; +namespace WebFiori\Framework\UI; use WebFiori\Collections\Comparable; /** diff --git a/WebFiori/Framework/Ui/HTTPCodeView.php b/WebFiori/Framework/Ui/HTTPCodeView.php index 316251778..2539d0b71 100644 --- a/WebFiori/Framework/Ui/HTTPCodeView.php +++ b/WebFiori/Framework/Ui/HTTPCodeView.php @@ -8,9 +8,9 @@ * https://github.com/WebFiori/.github/blob/main/LICENSE * */ -namespace webfiori\framework\ui; +namespace WebFiori\Framework\UI; -use webfiori\framework\App; +use WebFiori\Framework\App; use WebFiori\UI\HTMLNode; /** * A basic view which is used to display HTTP error codes taken from diff --git a/WebFiori/Framework/Ui/MessageBox.php b/WebFiori/Framework/Ui/MessageBox.php index af849fae2..59db37e49 100644 --- a/WebFiori/Framework/Ui/MessageBox.php +++ b/WebFiori/Framework/Ui/MessageBox.php @@ -8,7 +8,7 @@ * https://github.com/WebFiori/.github/blob/main/LICENSE * */ -namespace webfiori\framework\ui; +namespace WebFiori\Framework\UI; use WebFiori\UI\HTMLNode; /** @@ -138,13 +138,13 @@ private function _init() { $css = new HTMLNode('link'); $css->setAttributes([ 'rel' => 'stylesheet', - 'href' => 'https://cdn.jsdelivr.net/gh/webfiori/app@'.WF_VERSION.'/public/assets/css/message-box.css' + 'href' => 'https://cdn.jsdelivr.net/gh/WebFiori/app@'.WF_VERSION.'/public/assets/css/message-box.css' ]); $this->addChild($css); $js = new HTMLNode('script'); $js->setAttributes([ 'type' => 'text/javascript', - 'src' => 'https://cdn.jsdelivr.net/gh/webfiori/app@'.WF_VERSION.'/public/assets/js/message-box.js' + 'src' => 'https://cdn.jsdelivr.net/gh/WebFiori/app@'.WF_VERSION.'/public/assets/js/message-box.js' ]); $this->addChild($js); } diff --git a/WebFiori/Framework/Ui/ServerErrPage/ServerErrPage.php b/WebFiori/Framework/Ui/ServerErrPage/ServerErrPage.php index 1120e1360..80851c680 100644 --- a/WebFiori/Framework/Ui/ServerErrPage/ServerErrPage.php +++ b/WebFiori/Framework/Ui/ServerErrPage/ServerErrPage.php @@ -8,10 +8,10 @@ * https://github.com/WebFiori/.github/blob/main/LICENSE * */ -namespace webfiori\framework\ui\serverErrPage; +namespace WebFiori\Framework\UI\ServerErrPage; use WebFiori\Error\AbstractHandler; -use webfiori\framework\ui\WebPage; +use WebFiori\Framework\UI\WebPage; use WebFiori\UI\HTMLNode; /** * A page which is used to display exception information when it is thrown or @@ -41,7 +41,7 @@ public function __construct(AbstractHandler $throwableOrErr) { $this->addBeforeRender(function (WebPage $p) { $p->getDocument()->getBody()->addChild('script', [ - 'src' => 'https://cdn.jsdelivr.net/gh/webfiori/framework@'.WF_VERSION.'/assets/js/server-err.js', + 'src' => 'https://cdn.jsdelivr.net/gh/WebFiori/framework@'.WF_VERSION.'/assets/js/server-err.js', 'type' => 'text/javascript' ]); }); diff --git a/WebFiori/Framework/Ui/ServerErrPage/error-details.php b/WebFiori/Framework/Ui/ServerErrPage/error-details.php index 1a3a2a3d1..bde2da28d 100644 --- a/WebFiori/Framework/Ui/ServerErrPage/error-details.php +++ b/WebFiori/Framework/Ui/ServerErrPage/error-details.php @@ -1,5 +1,5 @@ diff --git a/WebFiori/Framework/Ui/ServerErrPage/server-err-header.php b/WebFiori/Framework/Ui/ServerErrPage/server-err-header.php index 79603599f..88fef9d5e 100644 --- a/WebFiori/Framework/Ui/ServerErrPage/server-err-header.php +++ b/WebFiori/Framework/Ui/ServerErrPage/server-err-header.php @@ -1,5 +1,5 @@ diff --git a/WebFiori/Framework/Ui/ServerErrPage/server-err-stack-trace.php b/WebFiori/Framework/Ui/ServerErrPage/server-err-stack-trace.php index fd7c16234..7b62f964d 100644 --- a/WebFiori/Framework/Ui/ServerErrPage/server-err-stack-trace.php +++ b/WebFiori/Framework/Ui/ServerErrPage/server-err-stack-trace.php @@ -1,5 +1,5 @@ setTitle('Welcome to WebFiori'); $div = $this->insert('div'); $div->addChild('img', [ - 'src' => 'https://webfiori.com/assets/images/WFLogo512.png', + 'src' => 'https://WebFiori.com/assets/images/WFLogo512.png', 'style' => 'width:250px;height:250px;border-radius:250px;background-color:black' ]); $div->setStyle([ @@ -56,7 +56,7 @@ public function __construct() { $cardsRow = $row->addChild('v-col', [ 'cols' => 12, ])->addChild('v-row'); - $this->createCard('https://webfiori.com/learn', + $this->createCard('https://WebFiori.com/learn', 'mdi-book-open-variant', 'Learn', 'Documentation is always the first place where developers can find what they need.' @@ -66,7 +66,7 @@ public function __construct() { .'experience with it, we recommend the ' .'documentation as they will help in a way or another.', $cardsRow->addChild('v-col', ['cols' => 12, 'md' => 6, 'sm' => 12])); - $this->createCard('https://webfiori.com/docs/webfiori', + $this->createCard('https://WebFiori.com/docs/WebFiori', 'mdi-book-check-outline', 'API Reference', 'This reference has all information about core framework classes that a developer ' @@ -74,7 +74,7 @@ public function __construct() { .'uses of every public class attribute and method. It can be handy when developers starts ' .'using advanced features of the framework.', $cardsRow->addChild('v-col', ['cols' => 12, 'md' => 6, 'sm' => 12])); - $this->createCard('https://webfiori.com/contribute', + $this->createCard('https://WebFiori.com/contribute', 'mdi-comment-plus-outline', 'Support The Project', 'Want to help in development of the framework or contribute? This place is for you. It holds ' diff --git a/WebFiori/Framework/Ui/WebPage.php b/WebFiori/Framework/Ui/WebPage.php index 58d0efb15..219ac76fb 100644 --- a/WebFiori/Framework/Ui/WebPage.php +++ b/WebFiori/Framework/Ui/WebPage.php @@ -8,24 +8,24 @@ * https://github.com/WebFiori/.github/blob/main/LICENSE * */ -namespace webfiori\framework\ui; +namespace WebFiori\Framework\UI; use Error; use Exception; use TypeError; use WebFiori\Collections\LinkedList; -use webfiori\framework\App; -use webfiori\framework\exceptions\InitializationException; -use webfiori\framework\exceptions\MissingLangException; -use webfiori\framework\exceptions\SessionException; -use webfiori\framework\exceptions\UIException; -use webfiori\framework\Lang; -use webfiori\framework\router\Router; -use webfiori\framework\session\Session; -use webfiori\framework\session\SessionsManager; -use webfiori\framework\Theme; -use webfiori\framework\ThemeManager; -use webfiori\framework\Util; +use WebFiori\Framework\App; +use WebFiori\Framework\Exceptions\InitializationException; +use WebFiori\Framework\Exceptions\MissingLangException; +use WebFiori\Framework\Exceptions\SessionException; +use WebFiori\Framework\Exceptions\UIException; +use WebFiori\Framework\Lang; +use WebFiori\Framework\Router\Router; +use WebFiori\Framework\Session\Session; +use WebFiori\Framework\Session\SessionsManager; +use WebFiori\Framework\Theme; +use WebFiori\Framework\ThemeManager; +use WebFiori\Framework\Util; use WebFiori\Http\Request; use WebFiori\Http\Response; use WebFiori\Json\Json; @@ -1174,7 +1174,7 @@ private function _getComponent($methToCall, $nodeId) { } throw new UIException('The the method "'.get_class($loadedTheme).'::'.$methToCall.'()" did not return ' - .'an instance of the class "webfiori\\ui\\HTMLNode".'); + .'an instance of the class "WebFiori\\ui\\HTMLNode".'); } /** * Sets the language of the page based on session language or @@ -1235,7 +1235,7 @@ private function getHead() { if (!($headNode instanceof HeadNode)) { throw new UIException('The method "'.get_class($loadedTheme).'::getHeadNode()" did not return ' - .'an instance of the class "webfiori\\ui\\HeadNode".'); + .'an instance of the class "WebFiori\\ui\\HeadNode".'); } } $headNode->addMeta('charset','UTF-8',true); diff --git a/WebFiori/Framework/Ui/ui-functions.php b/WebFiori/Framework/Ui/ui-functions.php index b0aa17fe1..21fe2b876 100644 --- a/WebFiori/Framework/Ui/ui-functions.php +++ b/WebFiori/Framework/Ui/ui-functions.php @@ -9,9 +9,9 @@ * */ -use webfiori\framework\exceptions\MissingLangException; -use webfiori\framework\Lang; -use webfiori\framework\ui\WebPage; +use WebFiori\Framework\Exceptions\MissingLangException; +use WebFiori\Framework\Lang; +use WebFiori\Framework\UI\WebPage; use WebFiori\Http\Response; use WebFiori\Json\JsonI; use WebFiori\UI\HTMLNode; diff --git a/WebFiori/Framework/User.php b/WebFiori/Framework/User.php index 7772c24b8..ca3f579fd 100644 --- a/WebFiori/Framework/User.php +++ b/WebFiori/Framework/User.php @@ -8,9 +8,9 @@ * https://github.com/WebFiori/.github/blob/main/LICENSE * */ -namespace webfiori\framework; +namespace WebFiori\Framework; -use webfiori\framework\session\SessionUser; +use WebFiori\Framework\Session\SessionUser; use WebFiori\Json\Json; use WebFiori\Json\JsonI; /** diff --git a/WebFiori/Framework/Util.php b/WebFiori/Framework/Util.php index cf3fc9d56..517ec19bc 100644 --- a/WebFiori/Framework/Util.php +++ b/WebFiori/Framework/Util.php @@ -8,10 +8,10 @@ * https://github.com/WebFiori/.github/blob/main/LICENSE * */ -namespace webfiori\framework; +namespace WebFiori\Framework; -use webfiori\framework\cli\Runner; -use webfiori\framework\ui\MessageBox; +use WebFiori\Framework\Cli\Runner; +use WebFiori\Framework\UI\MessageBox; use WebFiori\Http\Response; /** * Framework utility class. diff --git a/WebFiori/Framework/Writers/APITestCaseWriter.php b/WebFiori/Framework/Writers/APITestCaseWriter.php index e1972c1fa..cdd46eb8f 100644 --- a/WebFiori/Framework/Writers/APITestCaseWriter.php +++ b/WebFiori/Framework/Writers/APITestCaseWriter.php @@ -1,5 +1,5 @@ name: The name of the class that will be created. If not provided, the * string 'NewClass' is used. *
  • namespace: The namespace that the class will belong to. If not provided, - * the namespace 'webfiori' is used.
    • + * the namespace 'WebFiori' is used. *
  • path: The location at which the class will be created on. If not * provided, the constant ROOT_PATH is used.
    • * diff --git a/WebFiori/Framework/Writers/DBClassWriter.php b/WebFiori/Framework/Writers/DBClassWriter.php index 3113d9787..8ab043da5 100644 --- a/WebFiori/Framework/Writers/DBClassWriter.php +++ b/WebFiori/Framework/Writers/DBClassWriter.php @@ -8,14 +8,14 @@ * https://github.com/WebFiori/.github/blob/main/LICENSE * */ -namespace webfiori\framework\writers; +namespace WebFiori\Framework\Writers; use WebFiori\Database\Column; use WebFiori\Database\EntityMapper; use WebFiori\Database\MsSql\MSSQLColumn; use WebFiori\Database\MsSql\MSSQLTable; use WebFiori\Database\Table; -use webfiori\framework\DB; +use WebFiori\Framework\DB; /** * A class which is used to create a database access controller. * diff --git a/WebFiori/Framework/Writers/DatabaseMigrationWriter.php b/WebFiori/Framework/Writers/DatabaseMigrationWriter.php index ed807c230..dba8ead9b 100644 --- a/WebFiori/Framework/Writers/DatabaseMigrationWriter.php +++ b/WebFiori/Framework/Writers/DatabaseMigrationWriter.php @@ -8,7 +8,7 @@ * https://github.com/WebFiori/.github/blob/main/LICENSE * */ -namespace webfiori\framework\writers; +namespace WebFiori\Framework\Writers; use WebFiori\Database\Database; use WebFiori\Database\Schema\AbstractMigration; diff --git a/WebFiori/Framework/Writers/LangClassWriter.php b/WebFiori/Framework/Writers/LangClassWriter.php index 35fa00312..de71ccb67 100644 --- a/WebFiori/Framework/Writers/LangClassWriter.php +++ b/WebFiori/Framework/Writers/LangClassWriter.php @@ -8,9 +8,9 @@ * https://github.com/WebFiori/.github/blob/main/LICENSE * */ -namespace webfiori\framework\writers; +namespace WebFiori\Framework\Writers; -use webfiori\framework\Lang; +use WebFiori\Framework\Lang; /** * A writer which is used to write any class that represents a language class. * diff --git a/WebFiori/Framework/Writers/MiddlewareClassWriter.php b/WebFiori/Framework/Writers/MiddlewareClassWriter.php index 1fd6867a3..4efc9228e 100644 --- a/WebFiori/Framework/Writers/MiddlewareClassWriter.php +++ b/WebFiori/Framework/Writers/MiddlewareClassWriter.php @@ -8,10 +8,10 @@ * https://github.com/WebFiori/.github/blob/main/LICENSE * */ -namespace webfiori\framework\writers; +namespace WebFiori\Framework\Writers; -use webfiori\framework\middleware\AbstractMiddleware; -use webfiori\framework\session\SessionsManager; +use WebFiori\Framework\Middleware\AbstractMiddleware; +use WebFiori\Framework\Session\SessionsManager; use WebFiori\Http\Request; use WebFiori\Http\Response; /** @@ -32,7 +32,7 @@ class MiddlewareClassWriter extends ClassWriter { *
  • name: The name of the class that will be created. If not provided, the * string 'NewClass' is used.
    • *
  • namespace: The namespace that the class will belong to. If not provided, - * the namespace 'webfiori' is used.
    • + * the namespace 'WebFiori' is used. *
  • path: The location at which the class will be created on. If not * provided, the constant ROOT_PATH is used.
    • * diff --git a/WebFiori/Framework/Writers/SchedulerTaskClassWriter.php b/WebFiori/Framework/Writers/SchedulerTaskClassWriter.php index acc015798..928384105 100644 --- a/WebFiori/Framework/Writers/SchedulerTaskClassWriter.php +++ b/WebFiori/Framework/Writers/SchedulerTaskClassWriter.php @@ -8,13 +8,13 @@ * https://github.com/WebFiori/.github/blob/main/LICENSE * */ -namespace webfiori\framework\writers; +namespace WebFiori\Framework\Writers; -use webfiori\framework\scheduler\AbstractTask; -use webfiori\framework\scheduler\BaseTask; -use webfiori\framework\scheduler\TaskArgument; -use webfiori\framework\scheduler\TasksManager; -use webfiori\framework\scheduler\TaskStatusEmail; +use WebFiori\Framework\Scheduler\AbstractTask; +use WebFiori\Framework\Scheduler\BaseTask; +use WebFiori\Framework\Scheduler\TaskArgument; +use WebFiori\Framework\Scheduler\TasksManager; +use WebFiori\Framework\Scheduler\TaskStatusEmail; /** * A class which is used to write scheduler tasks classes. * @@ -158,7 +158,7 @@ public function writeClassBody() { $this->append('//TODO: Implement the action to perform when the task finishes to execute.', 2); $this->append("//\$email = new TaskStatusEmail('no-reply', [", 2); - $this->append("// 'webfiori@example.com' => 'Ibrahim Ali'", 2); + $this->append("// 'WebFiori@example.com' => 'Ibrahim Ali'", 2); $this->append('//]);', 2); $this->append('}', 1); diff --git a/WebFiori/Framework/Writers/ServiceHolder.php b/WebFiori/Framework/Writers/ServiceHolder.php index 1154b281f..4b9ca3510 100644 --- a/WebFiori/Framework/Writers/ServiceHolder.php +++ b/WebFiori/Framework/Writers/ServiceHolder.php @@ -8,7 +8,7 @@ * https://github.com/WebFiori/.github/blob/main/LICENSE * */ -namespace webfiori\framework\writers; +namespace WebFiori\Framework\Writers; use WebFiori\Http\AbstractWebService; /** diff --git a/WebFiori/Framework/Writers/TableClassWriter.php b/WebFiori/Framework/Writers/TableClassWriter.php index 92d739e62..3a2a52223 100644 --- a/WebFiori/Framework/Writers/TableClassWriter.php +++ b/WebFiori/Framework/Writers/TableClassWriter.php @@ -8,7 +8,7 @@ * https://github.com/WebFiori/.github/blob/main/LICENSE * */ -namespace webfiori\framework\writers; +namespace WebFiori\Framework\Writers; use const APP_DIR; use const APP_PATH; @@ -57,7 +57,7 @@ class TableClassWriter extends ClassWriter { *
  • name: The name of the class that will be created. If not provided, the * string 'NewClass' is used.
    • *
  • namespace: The namespace that the class will belong to. If not provided, - * the namespace 'webfiori' is used.
    • + * the namespace 'WebFiori' is used. *
  • path: The location at which the query will be created on. If not * provided, the constant ROOT_PATH is used.
    • *
  • entity-info: A sub associative array that contains information about the entity diff --git a/WebFiori/Framework/Writers/ThemeClassWriter.php b/WebFiori/Framework/Writers/ThemeClassWriter.php index 8072c7f5a..33754993b 100644 --- a/WebFiori/Framework/Writers/ThemeClassWriter.php +++ b/WebFiori/Framework/Writers/ThemeClassWriter.php @@ -8,10 +8,10 @@ * https://github.com/WebFiori/.github/blob/main/LICENSE * */ -namespace webfiori\framework\writers; +namespace WebFiori\Framework\Writers; use WebFiori\File\File; -use webfiori\framework\Theme; +use WebFiori\Framework\Theme; use WebFiori\UI\HeadNode; use WebFiori\UI\HTMLNode; diff --git a/WebFiori/Framework/Writers/ThemeComponentWriter.php b/WebFiori/Framework/Writers/ThemeComponentWriter.php index a14e96f3b..7588d1bc0 100644 --- a/WebFiori/Framework/Writers/ThemeComponentWriter.php +++ b/WebFiori/Framework/Writers/ThemeComponentWriter.php @@ -8,7 +8,7 @@ * https://github.com/WebFiori/.github/blob/main/LICENSE * */ -namespace webfiori\framework\writers; +namespace WebFiori\Framework\Writers; /** * A helper class which is used in generating theme template. diff --git a/WebFiori/Framework/Writers/WebServiceWriter.php b/WebFiori/Framework/Writers/WebServiceWriter.php index 59129c6ad..cae3c03b7 100644 --- a/WebFiori/Framework/Writers/WebServiceWriter.php +++ b/WebFiori/Framework/Writers/WebServiceWriter.php @@ -8,7 +8,7 @@ * https://github.com/WebFiori/.github/blob/main/LICENSE * */ -namespace webfiori\framework\writers; +namespace WebFiori\Framework\Writers; use WebFiori\Http\AbstractWebService; use WebFiori\Http\ParamOption; @@ -41,7 +41,7 @@ class WebServiceWriter extends ClassWriter { *
  • name: The name of the class that will be created. If not provided, the * string 'NewClass' is used.
    • *
  • namespace: The namespace that the class will belong to. If not provided, - * the namespace 'webfiori' is used.
    • + * the namespace 'WebFiori' is used. *
  • path: The location at which the query will be created on. If not * provided, the constant ROOT_PATH is used.
    • * diff --git a/composer.json b/composer.json index 1f1453bab..9acd5db7b 100644 --- a/composer.json +++ b/composer.json @@ -42,12 +42,12 @@ }, "autoload": { "psr-4": { - "webfiori\\framework\\": "webfiori/framework/" + "WebFiori\\Framework\\": "WebFiori/Framework/" } }, "autoload-dev": { "psr-4": { - "webfiori\\tests\\": "tests/" + "WebFiori\\Tests\\": "tests/" } }, "keywords": [ diff --git a/public/index.php b/public/index.php index 09da46ee1..8e8db2dcf 100644 --- a/public/index.php +++ b/public/index.php @@ -1,12 +1,12 @@ getCol('contact-type')->setIsUnique(false); $this->getCol('contact-type')->setIsPrimary(true); $this->table->addColumn('contact-info', new MySQLColumn('contact_info', 'varchar',320)); - $this->table->addReference('webfiori\tests\database\UsersQuery', [ + $this->table->addReference('WebFiori\tests\database\UsersQuery', [ 'user-id' => 'user-id' ], 'user_contact_info_fk', 'cadcade', 'cascade'); $this->setTable($this->table); diff --git a/tests/TestEntities/UserWithContact.php b/tests/TestEntities/UserWithContact.php index ce225b968..cccaf6426 100644 --- a/tests/TestEntities/UserWithContact.php +++ b/tests/TestEntities/UserWithContact.php @@ -1,7 +1,7 @@ getDBConnections()) + 1); $output = $this->executeSingleCommand(new AddCommand(), [ - 'webfiori', + 'WebFiori', 'add' ], [ '0', @@ -121,7 +121,7 @@ public function testAddDBConnection02() { $connName = 'db-connection-'.($count + 1); $output = $this->executeSingleCommand(new AddCommand(), [ - 'webfiori', + 'WebFiori', 'add' ], [ '0', @@ -169,8 +169,8 @@ public function testAddLang00() { $langCode = chr(65 + ($langCode[0] % 26)) . chr(65 + ($langCode[1] % 26)); // Clean up if it exists from previous runs - if (class_exists('\\app\\langs\\Lang' . $langCode)) { - $this->removeClass('\\app\\langs\\Lang' . $langCode); + if (class_exists('\\App\\Langs\\Lang' . $langCode)) { + $this->removeClass('\\App\\Langs\\Lang' . $langCode); } $output = $this->executeSingleCommand(new AddCommand(), [], [ @@ -198,8 +198,8 @@ public function testAddLang00() { "1: rtl\n", "Success: Language added. Also, a class for the language is created at \"".APP_DIR."\langs\" for that language.\n" ], $output); - $this->assertTrue(class_exists('\\app\\langs\\Lang' . $langCode)); - $this->removeClass('\\app\\langs\\Lang' . $langCode); + $this->assertTrue(class_exists('\\App\\Langs\\Lang' . $langCode)); + $this->removeClass('\\App\\Langs\\Lang' . $langCode); Controller::getDriver()->initialize(); } /** @@ -242,7 +242,7 @@ public function testAddLang02() { "Language code:\n", "Error: Invalid language code.\n", ], $output); - $this->removeClass('\\app\\langs\\LanguageFK'); + $this->removeClass('\\App\\Langs\\LanguageFK'); } /** * @test @@ -251,7 +251,7 @@ public function testAddSMTPConnection00() { $connName = 'smtp-connection-'.count(App::getConfig()->getSMTPConnections()); $output = $this->executeSingleCommand(new AddCommand(), [ - 'webfiori', + 'WebFiori', 'add' ], [ '1', diff --git a/tests/WebFiori/Framework/Tests/Cli/CreateAPITestCaseTest.php b/tests/WebFiori/Framework/Tests/Cli/CreateAPITestCaseTest.php index ee53c02d1..b6c9b0992 100644 --- a/tests/WebFiori/Framework/Tests/Cli/CreateAPITestCaseTest.php +++ b/tests/WebFiori/Framework/Tests/Cli/CreateAPITestCaseTest.php @@ -1,9 +1,9 @@ assertEquals([ "Info: Selected services manager has no service with name 'c'.\n", "Which service you would like to have a test case for?\n", @@ -38,7 +38,7 @@ public function testCreateAPITestCase01() { "4: set-password\n", "Test case will be created with following parameters:\n", "PHPUnit Version: 9\n", - 'Name: tests\webfiori\\framework\scheduler\webServices\\TasksLoginServiceTest'."\n", + 'Name: tests\WebFiori\\Framework\scheduler\webServices\\TasksLoginServiceTest'."\n", "Path: ".$path."\n", "Would you like to use default parameters?(Y/n)\n", "Info: New class was created at \"".$path."\".\n" @@ -53,7 +53,7 @@ public function testCreateAPITestCase01() { ])); $this->assertEquals(0, $this->getExitCode()); - $clazz = '\\tests\webfiori\\framework\scheduler\webServices\\TasksLoginServiceTest'; + $clazz = '\\tests\WebFiori\\Framework\scheduler\webServices\\TasksLoginServiceTest'; $this->assertTrue(file_exists($path.DS.'TasksLoginServiceTest.php')); require_once $path.DS.'TasksLoginServiceTest.php'; $this->assertTrue(class_exists($clazz)); @@ -63,7 +63,7 @@ public function testCreateAPITestCase01() { * @test */ public function testCreateAPITestCase02() { - $path = ROOT_PATH.DS."tests".DS."webfiori".DS."framework".DS."scheduler".DS."webServices"; + $path = ROOT_PATH.DS."tests".DS."WebFiori".DS."framework".DS."scheduler".DS."webServices"; $this->assertEquals([ "Info: New class was created at \"".$path."\".\n" ], $this->executeMultiCommand([ @@ -74,7 +74,7 @@ public function testCreateAPITestCase02() { '--defaults' ])); $this->assertEquals(0, $this->getExitCode()); - $clazz = '\\tests\webfiori\\framework\scheduler\webServices\\GetTasksServiceTest'; + $clazz = '\\tests\WebFiori\\Framework\scheduler\webServices\\GetTasksServiceTest'; $this->assertTrue(file_exists($path.DS.'GetTasksServiceTest.php')); require_once $path.DS.'GetTasksServiceTest.php'; $this->assertTrue(class_exists($clazz)); @@ -84,24 +84,24 @@ public function testCreateAPITestCase02() { * @test */ public function testCreateAPITestCase03() { - $path = ROOT_PATH.DS."tests".DS."webfiori".DS."framework".DS."scheduler".DS."webServices"; + $path = ROOT_PATH.DS."tests".DS."WebFiori".DS."framework".DS."scheduler".DS."webServices"; $this->assertEquals([ "Please enter services manager information:\n", "Test case will be created with following parameters:\n", "PHPUnit Version: 9\n", - 'Name: tests\webfiori\\framework\scheduler\webServices\\GetTasksServiceTest'."\n", + 'Name: tests\WebFiori\\Framework\scheduler\webServices\\GetTasksServiceTest'."\n", "Path: ".$path."\n", "Would you like to use default parameters?(Y/n)\n", "PHPUnit Version: Enter = '11'\n", "Enter a name for the new class:\n", - "Enter an optional namespace for the class: Enter = 'tests\webfiori\\framework\scheduler\webServices'\n", + "Enter an optional namespace for the class: Enter = 'tests\WebFiori\\Framework\scheduler\webServices'\n", "Info: New class was created at \"".$path."\".\n" ], $this->executeMultiCommand([ CreateCommand::class, '--c' => 'api-test', '--service' => 'get-tasks', ], [ - '\webfiori\\framework\scheduler\webServices\\TasksServicesManager', + '\WebFiori\\Framework\scheduler\webServices\\TasksServicesManager', 'n', '10', '', @@ -109,7 +109,7 @@ public function testCreateAPITestCase03() { ])); $this->assertEquals(0, $this->getExitCode()); - $clazz = '\\tests\webfiori\\framework\scheduler\webServices\\GetTasksServiceTest'; + $clazz = '\\tests\WebFiori\\Framework\scheduler\webServices\\GetTasksServiceTest'; $this->assertTrue(file_exists($path.DS.'GetTasksServiceTest.php')); require_once $path.DS.'GetTasksServiceTest.php'; $this->assertTrue(class_exists($clazz)); @@ -136,7 +136,7 @@ public function testCreateAPITestCase04() { '--c' => 'api-test', '--service' => 'say-hi-service', ], [ - '\\tests\\apis\\multiple\\ServicesManager00', + '\\Tests\\Apis\\Multiple\\ServicesManager00', 'n', '10', '', @@ -144,7 +144,7 @@ public function testCreateAPITestCase04() { ])); $this->assertEquals(0, $this->getExitCode()); - $clazz = '\\tests\\tests\\apis\\multiple\\WebService00Test'; + $clazz = '\\tests\\Tests\\Apis\\Multiple\\WebService00Test'; $this->assertTrue(file_exists($path.DS.'WebService00Test.php')); require_once $path.DS.'WebService00Test.php'; $this->assertTrue(class_exists($clazz)); @@ -160,7 +160,7 @@ public function testCreateAPITestCase05() { ], $this->executeMultiCommand([ CreateCommand::class, '--c' => 'api-test', - '--manager' => '\\tests\\apis\\emptyService\\EmptyServicesManager', + '--manager' => '\\Tests\\Apis\\EmptyService\\EmptyServicesManager', ])); $this->assertEquals(-1, $this->getExitCode()); } @@ -187,15 +187,15 @@ public function testCreateAPITestCase06() { '--c' => 'api-test', '--service' => 'say-hi-service', ], [ - '\\tests\\apis\\multiple\\WebService00', - '\\tests\\apis\\multiple\\ServicesManager00', + '\\Tests\\Apis\\Multiple\\WebService00', + '\\Tests\\Apis\\Multiple\\ServicesManager00', 'n', '10', '', '', ])); $this->assertEquals(0, $this->getExitCode()); - $clazz = '\\tests\\tests\\apis\\multiple\\WebService00Test'; + $clazz = '\\tests\\Tests\\Apis\\Multiple\\WebService00Test'; $this->assertTrue(file_exists($path.DS.'WebService00Test.php')); require_once $path.DS.'WebService00Test.php'; $this->assertTrue(class_exists($clazz)); @@ -206,11 +206,11 @@ public function testCreateAPITestCase06() { */ public function testCreateAPITestCase07() { $this->assertEquals([ - "Error: The argument --manager has invalid value: Not a class: \\tests\\apis\\emptyService\\Xyz\n", + "Error: The argument --manager has invalid value: Not a class: \\Tests\\Apis\\EmptyService\\Xyz\n", ], $this->executeMultiCommand([ CreateCommand::class, '--c' => 'api-test', - '--manager' => '\\tests\\apis\\emptyService\\Xyz', + '--manager' => '\\Tests\\Apis\\EmptyService\\Xyz', ])); $this->assertEquals(-1, $this->getExitCode()); } @@ -225,11 +225,11 @@ public function testCreateAPITestCase08() { CreateCommand::class, '--c' => 'api-test', '--service' => 'say-hi-service-2', - '--manager' => '\\tests\\apis\\multiple\\ServicesManager00', + '--manager' => '\\Tests\\Apis\\Multiple\\ServicesManager00', '--defaults' ])); $this->assertEquals(0, $this->getExitCode()); - $clazz = '\\tests\\tests\\apis\\multiple\\WebService01Test'; + $clazz = '\\tests\\Tests\\Apis\\Multiple\\WebService01Test'; $this->assertTrue(file_exists($path.DS.'WebService01Test.php')); require_once $path.DS.'WebService01Test.php'; $this->assertTrue(class_exists($clazz)); diff --git a/tests/WebFiori/Framework/Tests/Cli/CreateCLICommandTest.php b/tests/WebFiori/Framework/Tests/Cli/CreateCLICommandTest.php index 4f27c91d5..835806d43 100644 --- a/tests/WebFiori/Framework/Tests/Cli/CreateCLICommandTest.php +++ b/tests/WebFiori/Framework/Tests/Cli/CreateCLICommandTest.php @@ -1,9 +1,9 @@ executeSingleCommand(new CreateCommand(), [ - 'webfiori', + 'WebFiori', 'create' ], [ '5', @@ -62,7 +62,7 @@ public function testCreateCommand01() { } $output = $this->executeSingleCommand(new CreateCommand(), [ - 'webfiori', + 'WebFiori', 'create', '--c' => 'command' ], [ diff --git a/tests/WebFiori/Framework/Tests/Cli/CreateCommandTest.php b/tests/WebFiori/Framework/Tests/Cli/CreateCommandTest.php index b60a4b452..eacb03f84 100644 --- a/tests/WebFiori/Framework/Tests/Cli/CreateCommandTest.php +++ b/tests/WebFiori/Framework/Tests/Cli/CreateCommandTest.php @@ -1,8 +1,8 @@ executeSingleCommand(new CreateCommand(), [ - 'webfiori', + 'WebFiori', 'create' ], [ '11', @@ -44,7 +44,7 @@ public function testCreate00() { */ public function testCreate01() { $output = $this->executeSingleCommand(new CreateCommand(), [ - 'webfiori', + 'WebFiori', 'create' ], [ "\n", // Hit Enter to pick default value (quit) diff --git a/tests/WebFiori/Framework/Tests/Cli/CreateDBAccessTest.php b/tests/WebFiori/Framework/Tests/Cli/CreateDBAccessTest.php index 13664f854..241d59b0b 100644 --- a/tests/WebFiori/Framework/Tests/Cli/CreateDBAccessTest.php +++ b/tests/WebFiori/Framework/Tests/Cli/CreateDBAccessTest.php @@ -1,10 +1,10 @@ removeAllDBConnections(); $output = $this->executeSingleCommand(new CreateCommand(), [ - 'webfiori', + 'WebFiori', 'create', '--c' => 'db' ], [ - 'tables\\EmployeeInfoTable', + 'Tables\\EmployeeInfoTable', 'EmployeeOperations', "\n", // Hit Enter to pick default value (app\database) 'SuperUser', @@ -36,15 +36,15 @@ public function test00() { "Enter database table class name (include namespace):\n", "We need from you to give us class information.\n", "Enter a name for the new class:\n", - "Enter an optional namespace for the class: Enter = 'app\database'\n", + "Enter an optional namespace for the class: Enter = 'App\Database'\n", "Warning: No database connections were found. Make sure to specify connection later inside the class.\n", "We need from you to give us entity class information.\n", "Entity class name:\n", - "Entity namespace: Enter = 'app\\entity'\n", + "Entity namespace: Enter = 'App\\Entity'\n", "Would you like to have update methods for every single column?(y/N)\n", "Info: New class was created at \"". ROOT_PATH.DS."app".DS."database\".\n" ], $output); - $clazz = '\\app\\database\\EmployeeOperationsDB'; + $clazz = '\\App\\Database\\EmployeeOperationsDB'; $this->assertTrue(class_exists($clazz)); $this->removeClass($clazz); } @@ -54,15 +54,15 @@ public function test00() { */ public function test01() { $output = $this->executeSingleCommand(new CreateCommand(), [ - 'webfiori', + 'WebFiori', 'create', '--c' => 'db' ], [ - 'tables\\EmployeeInfoTable', + 'Tables\\EmployeeInfoTable', 'EmployeeS', - 'app\\database\\empl', + 'App\\Database\\empl', 'SuperHero', - 'app\\entity\\subs', + 'App\\Entity\\subs', 'y' ]); @@ -71,15 +71,15 @@ public function test01() { "Enter database table class name (include namespace):\n", "We need from you to give us class information.\n", "Enter a name for the new class:\n", - "Enter an optional namespace for the class: Enter = 'app\database'\n", + "Enter an optional namespace for the class: Enter = 'App\Database'\n", "Warning: No database connections were found. Make sure to specify connection later inside the class.\n", "We need from you to give us entity class information.\n", "Entity class name:\n", - "Entity namespace: Enter = 'app\\entity'\n", + "Entity namespace: Enter = 'App\\Entity'\n", "Would you like to have update methods for every single column?(y/N)\n", "Info: New class was created at \"". ROOT_PATH.DS."app".DS."database".DS."empl\".\n" ], $output); - $clazz = '\\app\\database\\empl\\EmployeeSDB'; + $clazz = '\\App\\Database\\empl\\EmployeeSDB'; $this->assertTrue(class_exists($clazz)); $this->removeClass($clazz); } @@ -94,16 +94,16 @@ public function test02() { App::getConfig()->addOrUpdateDBConnection($conn); $output = $this->executeSingleCommand(new CreateCommand(), [ - 'webfiori', + 'WebFiori', 'create', '--c' => 'db' ], [ - 'tables\\PositionInfoTable', + 'Tables\\PositionInfoTable', 'Position2x', - 'app\\database', + 'App\\Database', '0', 'SuperPosition', - 'app\\entity\\subs', + 'App\\Entity\\subs', 'y' ]); @@ -112,17 +112,17 @@ public function test02() { "Enter database table class name (include namespace):\n", "We need from you to give us class information.\n", "Enter a name for the new class:\n", - "Enter an optional namespace for the class: Enter = 'app\database'\n", + "Enter an optional namespace for the class: Enter = 'App\Database'\n", "Select database connecion to use with the class:\n", "0: Test Connection\n", "1: None <--\n", "We need from you to give us entity class information.\n", "Entity class name:\n", - "Entity namespace: Enter = 'app\\entity'\n", + "Entity namespace: Enter = 'App\\Entity'\n", "Would you like to have update methods for every single column?(y/N)\n", "Info: New class was created at \"". ROOT_PATH.DS."app".DS."database\".\n" ], $output); - $clazz = '\\app\\database\\Position2xDB'; + $clazz = '\\App\\Database\\Position2xDB'; $this->assertTrue(class_exists($clazz)); $this->removeClass($clazz); } diff --git a/tests/WebFiori/Framework/Tests/Cli/CreateEntityTest.php b/tests/WebFiori/Framework/Tests/Cli/CreateEntityTest.php index f0d107ffa..0c155d31c 100644 --- a/tests/WebFiori/Framework/Tests/Cli/CreateEntityTest.php +++ b/tests/WebFiori/Framework/Tests/Cli/CreateEntityTest.php @@ -1,9 +1,9 @@ executeSingleCommand(new CreateCommand(), [ - 'webfiori', + 'WebFiori', 'create', '--c' => 'entity', '--table' => TestTable::class @@ -32,7 +32,7 @@ public function testCreateEntity00() { $this->assertEquals([ "We need from you to give us entity class information.\n", "Enter a name for the new class:\n", - "Enter an optional namespace for the class: Enter = 'app\\entity'\n", + "Enter an optional namespace for the class: Enter = 'App\\Entity'\n", "Would you like from your class to implement the interface JsonI?(Y/n)\n", "Would you like to add extra attributes to the entity?(y/N)\n", "Enter attribute name:\n", @@ -48,8 +48,8 @@ public function testCreateEntity00() { "Generating your entity...\n", "Success: Entity class created.\n" ], $output); - $this->assertTrue(class_exists('\\app\\entity\\NeEntity')); - $this->removeClass('\\app\\entity\\NeEntity'); + $this->assertTrue(class_exists('\\App\\Entity\\NeEntity')); + $this->removeClass('\\App\\Entity\\NeEntity'); } /** @@ -57,7 +57,7 @@ public function testCreateEntity00() { */ public function testCreateEntity01() { $output = $this->executeSingleCommand(new CreateCommand(), [ - 'webfiori', + 'WebFiori', 'create', '--c' => 'entiy', // Invalid command value '--table' => TestTable::class @@ -93,7 +93,7 @@ public function testCreateEntity01() { "11: Quit. <--\n", "We need from you to give us entity class information.\n", "Enter a name for the new class:\n", - "Enter an optional namespace for the class: Enter = 'app\\entity'\n", + "Enter an optional namespace for the class: Enter = 'App\\Entity'\n", "Would you like from your class to implement the interface JsonI?(Y/n)\n", "Would you like to add extra attributes to the entity?(y/N)\n", "Enter attribute name:\n", @@ -109,7 +109,7 @@ public function testCreateEntity01() { "Generating your entity...\n", "Success: Entity class created.\n" ], $output); - $this->assertTrue(class_exists('\\app\\entity\\NewEntity')); - $this->removeClass('\\app\\entity\\NewEntity'); + $this->assertTrue(class_exists('\\App\\Entity\\NewEntity')); + $this->removeClass('\\App\\Entity\\NewEntity'); } } diff --git a/tests/WebFiori/Framework/Tests/Cli/CreateMiddlewareTest.php b/tests/WebFiori/Framework/Tests/Cli/CreateMiddlewareTest.php index 68c2b3d71..63c137a04 100644 --- a/tests/WebFiori/Framework/Tests/Cli/CreateMiddlewareTest.php +++ b/tests/WebFiori/Framework/Tests/Cli/CreateMiddlewareTest.php @@ -1,10 +1,10 @@ executeSingleCommand(new CreateCommand(), [ - 'webfiori', + 'WebFiori', 'create' ], [ '4', 'NewCoolMd', - 'app\middleware', + 'App\Middleware', 'Check is authorized', '22', "\n", // Hit Enter to pick default value (no group) @@ -44,14 +44,14 @@ public function testCreateMiddleware00() { "10: Database migration.\n", "11: Quit. <--\n", "Enter a name for the new class:\n", - "Enter an optional namespace for the class: Enter = 'app\middleware'\n", + "Enter an optional namespace for the class: Enter = 'App\Middleware'\n", "Enter a name for the middleware:\n", "Enter middleware priority: Enter = '0'\n", "Would you like to add the middleware to a group?(y/N)\n", 'Info: New class was created at "'.ROOT_PATH.DS.'app'.DS."middleware\".\n", ], $output); - $this->assertTrue(class_exists('\\app\\middleware\\NewCoolMdMiddleware')); - $this->removeClass('\\app\\middleware\\NewCoolMdMiddleware'); + $this->assertTrue(class_exists('\\App\\Middleware\\NewCoolMdMiddleware')); + $this->removeClass('\\App\\Middleware\\NewCoolMdMiddleware'); } /** @@ -59,12 +59,12 @@ public function testCreateMiddleware00() { */ public function testCreateMiddleware01() { $output = $this->executeSingleCommand(new CreateCommand(), [ - 'webfiori', + 'WebFiori', 'create', '--c' => 'middleware' ], [ 'NewCool', - 'app\middleware', + 'App\Middleware', ' ', // Invalid input (spaces only) 'Check is cool', '22', @@ -76,7 +76,7 @@ public function testCreateMiddleware01() { $this->assertEquals(0, $this->getExitCode()); $this->assertEquals([ "Enter a name for the new class:\n", - "Enter an optional namespace for the class: Enter = 'app\middleware'\n", + "Enter an optional namespace for the class: Enter = 'App\Middleware'\n", "Enter a name for the middleware:\n", "Error: Invalid input is given. Try again.\n", "Enter a name for the middleware:\n", @@ -87,7 +87,7 @@ public function testCreateMiddleware01() { 'Info: New class was created at "'.ROOT_PATH.DS.'app'.DS."middleware\".\n", ], $output); - $clazz = '\\app\\middleware\\NewCoolMiddleware'; + $clazz = '\\App\\Middleware\\NewCoolMiddleware'; $this->assertTrue(class_exists($clazz)); $clazzObj = new $clazz(); $this->assertTrue($clazzObj instanceof AbstractMiddleware); diff --git a/tests/WebFiori/Framework/Tests/Cli/CreateMigrationTest.php b/tests/WebFiori/Framework/Tests/Cli/CreateMigrationTest.php index 0ef67a48e..841fa27ca 100644 --- a/tests/WebFiori/Framework/Tests/Cli/CreateMigrationTest.php +++ b/tests/WebFiori/Framework/Tests/Cli/CreateMigrationTest.php @@ -1,9 +1,9 @@ assertEquals([ "Migration namespace: Enter = 'app\database\migrations'\n", diff --git a/tests/WebFiori/Framework/Tests/Cli/CreateRESTTest.php b/tests/WebFiori/Framework/Tests/Cli/CreateRESTTest.php index 7c7273492..dbcad0935 100644 --- a/tests/WebFiori/Framework/Tests/Cli/CreateRESTTest.php +++ b/tests/WebFiori/Framework/Tests/Cli/CreateRESTTest.php @@ -1,11 +1,11 @@ removeAllDBConnections(); $output = $this->executeSingleCommand(new CreateCommand(), [ - 'webfiori', + 'WebFiori', 'create', '--c' => 'rest' ], [ '0', 'SuperUser', - 'app\\entity\\super', + 'App\\Entity\\super', 'y', 'n', - "app\\database\\super", + "App\\Database\\super", "super_users", "A table to hold super users information.", "id", @@ -57,7 +57,7 @@ public function test00() { "n", 'n', "y", - "app\\apis\\super" + "App\\Apis\\super" ]); $this->assertEquals(0, $this->getExitCode()); @@ -69,11 +69,11 @@ public function test00() { "1: mssql\n", "First thing, we need entity class information.\n", "Enter a name for the new class:\n", - "Enter an optional namespace for the class: Enter = 'app\\entity'\n", + "Enter an optional namespace for the class: Enter = 'App\\Entity'\n", "Would you like from your entity class to implement the interface JsonI?(Y/n)\n", "Would you like to add extra attributes to the entity?(y/N)\n", "Now, time to collect database table information.\n", - "Provide us with a namespace for table class: Enter = 'app\database'\n", + "Provide us with a namespace for table class: Enter = 'App\Database'\n", "Enter database table name:\n", "Enter your optional comment about the table:\n", "Now you have to add columns to the table.\n", @@ -108,7 +108,7 @@ public function test00() { "Would you like to add another column?(y/N)\n", "Would you like to add foreign keys to the table?(y/N)\n", "Would you like to have update methods for every single column?(y/N)\n", - "Last thing needed is to provide us with namespace for web services: Enter = 'app\\apis'\n", + "Last thing needed is to provide us with namespace for web services: Enter = 'App\\Apis'\n", "Creating entity class...\n", "Creating database table class...\n", "Creating database access class...\n", @@ -116,17 +116,17 @@ public function test00() { "Done.\n" ]), $output); - $tableClazz = '\\app\\database\\super\\SuperUserTable'; - $entityClazz = '\\app\\entity\\super\\SuperUser'; - $dbClazz = "\\app\\database\\super\\SuperUserDB"; + $tableClazz = '\\App\\Database\\super\\SuperUserTable'; + $entityClazz = '\\App\\Entity\\super\\SuperUser'; + $dbClazz = "\\App\\Database\\super\\SuperUserDB"; $apiClazzes = [ - '\\app\\apis\\super\\AddSuperUserService', - '\\app\\apis\\super\\DeleteSuperUserService', - '\\app\\apis\\super\\GetAllSuperUsersService', - '\\app\\apis\\super\\GetSuperUserService', - '\\app\\apis\\super\\UpdateSuperUserService', - '\\app\\apis\\super\\UpdateFirstNameOfSuperUserService', - '\\app\\apis\\super\\UpdateIsHappyOfSuperUserService' + '\\App\\Apis\\super\\AddSuperUserService', + '\\App\\Apis\\super\\DeleteSuperUserService', + '\\App\\Apis\\super\\GetAllSuperUsersService', + '\\App\\Apis\\super\\GetSuperUserService', + '\\App\\Apis\\super\\UpdateSuperUserService', + '\\App\\Apis\\super\\UpdateFirstNameOfSuperUserService', + '\\App\\Apis\\super\\UpdateIsHappyOfSuperUserService' ]; foreach ($apiClazzes as $clazz) { @@ -152,16 +152,16 @@ public function test01() { App::getConfig()->removeAllDBConnections(); $output = $this->executeSingleCommand(new CreateCommand(), [ - 'webfiori', + 'WebFiori', 'create', '--c' => 'rest' ], [ '0', 'SuperUserX', - 'app\\entity\\super', + 'App\\Entity\\super', 'y', 'n', - "app\\database\\super", + "App\\Database\\super", "super_users", "A table to hold super users information.", "id", @@ -191,7 +191,7 @@ public function test01() { "n", 'n', "y", - "app\\apis\\super" + "App\\Apis\\super" ]); $this->assertEquals(0, $this->getExitCode()); @@ -202,11 +202,11 @@ public function test01() { "1: mssql\n", "First thing, we need entity class information.\n", "Enter a name for the new class:\n", - "Enter an optional namespace for the class: Enter = 'app\\entity'\n", + "Enter an optional namespace for the class: Enter = 'App\\Entity'\n", "Would you like from your entity class to implement the interface JsonI?(Y/n)\n", "Would you like to add extra attributes to the entity?(y/N)\n", "Now, time to collect database table information.\n", - "Provide us with a namespace for table class: Enter = 'app\database'\n", + "Provide us with a namespace for table class: Enter = 'App\Database'\n", "Enter database table name:\n", "Enter your optional comment about the table:\n", "Now you have to add columns to the table.\n", @@ -243,7 +243,7 @@ public function test01() { "Would you like to add another column?(y/N)\n", "Would you like to add foreign keys to the table?(y/N)\n", "Would you like to have update methods for every single column?(y/N)\n", - "Last thing needed is to provide us with namespace for web services: Enter = 'app\\apis'\n", + "Last thing needed is to provide us with namespace for web services: Enter = 'App\\Apis'\n", "Creating entity class...\n", "Creating database table class...\n", "Creating database access class...\n", @@ -251,18 +251,18 @@ public function test01() { "Done.\n" ]), $output); - $tableClazz = '\\app\\database\\super\\SuperUserXTable'; - $entityClazz = '\\app\\entity\\super\\SuperUserX'; - $dbClazz = "\\app\\database\\super\\SuperUserXDB"; + $tableClazz = '\\App\\Database\\super\\SuperUserXTable'; + $entityClazz = '\\App\\Entity\\super\\SuperUserX'; + $dbClazz = "\\App\\Database\\super\\SuperUserXDB"; $apiClazzes = [ - '\\app\\apis\\super\\AddSuperUserXService', - '\\app\\apis\\super\\DeleteSuperUserXService', - '\\app\\apis\\super\\GetAllSuperUserXsService', - '\\app\\apis\\super\\GetSuperUserXService', - '\\app\\apis\\super\\UpdateSuperUserXService', - '\\app\\apis\\super\\UpdateFirstNameOfSuperUserXService', - '\\app\\apis\\super\\UpdateIsHappyOfSuperUserXService', - '\\app\\apis\\super\\UpdateIdOfSuperUserXService' + '\\App\\Apis\\super\\AddSuperUserXService', + '\\App\\Apis\\super\\DeleteSuperUserXService', + '\\App\\Apis\\super\\GetAllSuperUserXsService', + '\\App\\Apis\\super\\GetSuperUserXService', + '\\App\\Apis\\super\\UpdateSuperUserXService', + '\\App\\Apis\\super\\UpdateFirstNameOfSuperUserXService', + '\\App\\Apis\\super\\UpdateIsHappyOfSuperUserXService', + '\\App\\Apis\\super\\UpdateIdOfSuperUserXService' ]; foreach ($apiClazzes as $clazz) { @@ -291,16 +291,16 @@ public function test02() { App::getConfig()->addOrUpdateDBConnection($conn); $output = $this->executeSingleCommand(new CreateCommand(), [ - 'webfiori', + 'WebFiori', 'create', '--c' => 'rest', ], [ 'Super Connection', 'SuperUserX9', - 'app\\entity\\super', + 'App\\Entity\\super', 'y', 'n', - "app\\database\\super", + "App\\Database\\super", "super_users", "A table to hold super users information.", "id", @@ -330,7 +330,7 @@ public function test02() { "n", 'n', "y", - "app\\apis\\super" + "App\\Apis\\super" ]); $this->assertEquals(0, $this->getExitCode()); @@ -339,11 +339,11 @@ public function test02() { "0: Super Connection <--\n", "First thing, we need entity class information.\n", "Enter a name for the new class:\n", - "Enter an optional namespace for the class: Enter = 'app\\entity'\n", + "Enter an optional namespace for the class: Enter = 'App\\Entity'\n", "Would you like from your entity class to implement the interface JsonI?(Y/n)\n", "Would you like to add extra attributes to the entity?(y/N)\n", "Now, time to collect database table information.\n", - "Provide us with a namespace for table class: Enter = 'app\database'\n", + "Provide us with a namespace for table class: Enter = 'App\Database'\n", "Enter database table name:\n", "Enter your optional comment about the table:\n", "Now you have to add columns to the table.\n", @@ -378,7 +378,7 @@ public function test02() { "Would you like to add another column?(y/N)\n", "Would you like to add foreign keys to the table?(y/N)\n", "Would you like to have update methods for every single column?(y/N)\n", - "Last thing needed is to provide us with namespace for web services: Enter = 'app\\apis'\n", + "Last thing needed is to provide us with namespace for web services: Enter = 'App\\Apis'\n", "Creating entity class...\n", "Creating database table class...\n", "Creating database access class...\n", @@ -386,19 +386,19 @@ public function test02() { "Done.\n" ]), $output); - $tableClazz = '\\app\\database\\super\\SuperUserX9Table'; - $entityClazz = '\\app\\entity\\super\\SuperUserX9'; - $dbClazz = "\\app\\database\\super\\SuperUserX9DB"; + $tableClazz = '\\App\\Database\\super\\SuperUserX9Table'; + $entityClazz = '\\App\\Entity\\super\\SuperUserX9'; + $dbClazz = "\\App\\Database\\super\\SuperUserX9DB"; $apiClazzes = [ - '\\app\\apis\\super\\AddSuperUserX9Service', - '\\app\\apis\\super\\DeleteSuperUserX9Service', - '\\app\\apis\\super\\GetAllSuperUserX9sService', - '\\app\\apis\\super\\GetSuperUserX9Service', - '\\app\\apis\\super\\UpdateSuperUserX9Service', - '\\app\\apis\\super\\UpdateFirstNameOfSuperUserX9Service', - '\\app\\apis\\super\\UpdateIsHappyOfSuperUserX9Service', - '\\app\\apis\\super\\UpdateIdOfSuperUserX9Service', - '\\app\\apis\\super\\UpdateIsHappyOfSuperUserX9Service' + '\\App\\Apis\\super\\AddSuperUserX9Service', + '\\App\\Apis\\super\\DeleteSuperUserX9Service', + '\\App\\Apis\\super\\GetAllSuperUserX9sService', + '\\App\\Apis\\super\\GetSuperUserX9Service', + '\\App\\Apis\\super\\UpdateSuperUserX9Service', + '\\App\\Apis\\super\\UpdateFirstNameOfSuperUserX9Service', + '\\App\\Apis\\super\\UpdateIsHappyOfSuperUserX9Service', + '\\App\\Apis\\super\\UpdateIdOfSuperUserX9Service', + '\\App\\Apis\\super\\UpdateIsHappyOfSuperUserX9Service' ]; foreach ($apiClazzes as $clazz) { diff --git a/tests/WebFiori/Framework/Tests/Cli/CreateTableTest.php b/tests/WebFiori/Framework/Tests/Cli/CreateTableTest.php index e94674e7b..2e2ab4570 100644 --- a/tests/WebFiori/Framework/Tests/Cli/CreateTableTest.php +++ b/tests/WebFiori/Framework/Tests/Cli/CreateTableTest.php @@ -1,13 +1,13 @@ executeSingleCommand(new CreateCommand(), [ - 'webfiori', + 'WebFiori', 'create', '--c' => 'table' ], [ @@ -87,8 +87,8 @@ public function testCreateTable00() { ]); $this->assertEquals(0, $this->getExitCode()); - $this->assertTrue(class_exists('\\app\\database\\Cool00Table')); - $clazz = '\\app\\database\\Cool00Table'; + $this->assertTrue(class_exists('\\App\\Database\\Cool00Table')); + $clazz = '\\App\\Database\\Cool00Table'; $this->removeClass($clazz); $testObj = new $clazz(); $this->assertTrue($testObj instanceof MySQLTable); @@ -107,7 +107,7 @@ public function testCreateTable00() { "0: mysql\n", "1: mssql\n", "Enter a name for the new class:\n", - "Enter an optional namespace for the class: Enter = 'app\database'\n", + "Enter an optional namespace for the class: Enter = 'App\Database'\n", "Enter database table name: Enter = 'cool_00_table'\n", "Enter your optional comment about the table:\n", "Now you have to add columns to the table.\n", @@ -129,7 +129,7 @@ public function testCreateTable00() { */ public function testCreateTable01() { $output = $this->executeSingleCommand(new CreateCommand(), [ - 'webfiori', + 'WebFiori', 'create', '--c' => 'table' ], [ @@ -149,7 +149,7 @@ public function testCreateTable01() { ]); $this->assertEquals(0, $this->getExitCode()); - $clazz = '\\app\\database\\Cool01Table'; + $clazz = '\\App\\Database\\Cool01Table'; $this->assertTrue(class_exists($clazz)); $this->removeClass($clazz); $testObj = new $clazz(); @@ -172,7 +172,7 @@ public function testCreateTable01() { "0: mysql\n", "1: mssql\n", "Enter a name for the new class:\n", - "Enter an optional namespace for the class: Enter = 'app\database'\n", + "Enter an optional namespace for the class: Enter = 'App\Database'\n", "Enter database table name: Enter = 'cool_01_table'\n", "Enter your optional comment about the table:\n", "Now you have to add columns to the table.\n", @@ -193,7 +193,7 @@ public function testCreateTable01() { */ public function testCreateTable02() { $output = $this->executeSingleCommand(new CreateCommand(), [ - 'webfiori', + 'WebFiori', 'create', '--c' => 'table' ], [ @@ -225,8 +225,8 @@ public function testCreateTable02() { ]); $this->assertEquals(0, $this->getExitCode()); - $this->assertTrue(class_exists('\\app\\database\\Cool02Table')); - $clazz = '\\app\\database\\Cool02Table'; + $this->assertTrue(class_exists('\\App\\Database\\Cool02Table')); + $clazz = '\\App\\Database\\Cool02Table'; $this->removeClass($clazz); $testObj = new $clazz(); $this->assertTrue($testObj instanceof MySQLTable); @@ -247,7 +247,7 @@ public function testCreateTable02() { "0: mysql\n", "1: mssql\n", "Enter a name for the new class:\n", - "Enter an optional namespace for the class: Enter = 'app\database'\n", + "Enter an optional namespace for the class: Enter = 'App\Database'\n", "Enter database table name: Enter = 'cool_02_table'\n", "Enter your optional comment about the table:\n", "Now you have to add columns to the table.\n", diff --git a/tests/WebFiori/Framework/Tests/Cli/CreateTaskTest.php b/tests/WebFiori/Framework/Tests/Cli/CreateTaskTest.php index 17acb7f10..1c3197e2e 100644 --- a/tests/WebFiori/Framework/Tests/Cli/CreateTaskTest.php +++ b/tests/WebFiori/Framework/Tests/Cli/CreateTaskTest.php @@ -1,10 +1,10 @@ executeSingleCommand(new CreateCommand(), [ - 'webfiori', + 'WebFiori', 'create' ], [ '3', 'SuperCoolTask', - 'app\tasks', + 'App\Tasks', 'The Greatest task', 'The task will do nothing.', 'N', @@ -45,13 +45,13 @@ public function test00() { "10: Database migration.\n", "11: Quit. <--\n", "Enter a name for the new class:\n", - "Enter an optional namespace for the class: Enter = 'app\\tasks'\n", + "Enter an optional namespace for the class: Enter = 'App\\Tasks'\n", "Enter a name for the task:\n", "Provide short description of what does the task will do:\n", "Would you like to add arguments to the task?(y/N)\n", "Info: New class was created at \"".ROOT_PATH.DS.'app'.DS."tasks\".\n", ], $output); - $clazz = '\\app\\tasks\\SuperCoolTask'; + $clazz = '\\App\\Tasks\\SuperCoolTask'; $this->assertTrue(class_exists($clazz)); $this->removeClass($clazz); } @@ -61,14 +61,14 @@ public function test00() { */ public function test01() { $output = $this->executeSingleCommand(new CreateCommand(), [ - 'webfiori', + 'WebFiori', 'create' ], [ '3', 'SuperCoolTask', - 'app\tasks', + 'App\Tasks', 'SuperCool2', - 'app\tasks', + 'App\Tasks', 'The Greatest task', 'The task will do nothing.', 'N', @@ -91,18 +91,18 @@ public function test01() { "10: Database migration.\n", "11: Quit. <--\n", "Enter a name for the new class:\n", - "Enter an optional namespace for the class: Enter = 'app\\tasks'\n", + "Enter an optional namespace for the class: Enter = 'App\\Tasks'\n", "Error: A class in the given namespace which has the given name was found.\n", "Enter a name for the new class:\n", - "Enter an optional namespace for the class: Enter = 'app\\tasks'\n", + "Enter an optional namespace for the class: Enter = 'App\\Tasks'\n", "Enter a name for the task:\n", "Provide short description of what does the task will do:\n", "Would you like to add arguments to the task?(y/N)\n", "Info: New class was created at \"".ROOT_PATH.DS.'app'.DS."tasks\".\n", ], $output); - $clazz = '\\app\\tasks\\SuperCool2Task'; + $clazz = '\\App\\Tasks\\SuperCool2Task'; $this->assertTrue(class_exists($clazz)); - $this->removeClass('\\app\\tasks\\SuperCoolTask'); + $this->removeClass('\\App\\Tasks\\SuperCoolTask'); $this->removeClass($clazz); } @@ -111,12 +111,12 @@ public function test01() { */ public function test02() { $output = $this->executeSingleCommand(new CreateCommand(), [ - 'webfiori', + 'WebFiori', 'create' ], [ '3', 'NewRound', - 'app\tasks', + 'App\Tasks', '', // Invalid empty name 'Invalid#', // Invalid name with special character 'Create Round task', @@ -142,7 +142,7 @@ public function test02() { "10: Database migration.\n", "11: Quit. <--\n", "Enter a name for the new class:\n", - "Enter an optional namespace for the class: Enter = 'app\\tasks'\n", + "Enter an optional namespace for the class: Enter = 'App\\Tasks'\n", "Enter a name for the task:\n", "Error: Provided name is invalid!\n", "Enter a name for the task:\n", @@ -154,7 +154,7 @@ public function test02() { "Would you like to add arguments to the task?(y/N)\n", "Info: New class was created at \"".ROOT_PATH.DS.'app'.DS."tasks\".\n", ], $output); - $clazz = '\\app\\tasks\\NewRoundTask'; + $clazz = '\\App\\Tasks\\NewRoundTask'; $this->assertTrue(class_exists($clazz)); $this->removeClass($clazz); } @@ -164,12 +164,12 @@ public function test02() { */ public function test03() { $output = $this->executeSingleCommand(new CreateCommand(), [ - 'webfiori', + 'WebFiori', 'create', '--c' => 'task' ], [ 'SendDailyReport', - 'app\tasks', + 'App\Tasks', 'Send Sales Report', 'The task will execute every day to send sales report to management.', 'y', @@ -190,7 +190,7 @@ public function test03() { $this->assertEquals(0, $this->getExitCode()); $this->assertEquals([ "Enter a name for the new class:\n", - "Enter an optional namespace for the class: Enter = 'app\\tasks'\n", + "Enter an optional namespace for the class: Enter = 'App\\Tasks'\n", "Enter a name for the task:\n", "Provide short description of what does the task will do:\n", "Would you like to add arguments to the task?(y/N)\n", @@ -210,7 +210,7 @@ public function test03() { "Would you like to add more arguments?(y/N)\n", "Info: New class was created at \"".ROOT_PATH.DS.'app'.DS."tasks\".\n", ], $output); - $clazz = '\\app\\tasks\\SendDailyReportTask'; + $clazz = '\\App\\Tasks\\SendDailyReportTask'; $this->assertTrue(class_exists($clazz)); $this->removeClass($clazz); $task = new $clazz(); diff --git a/tests/WebFiori/Framework/Tests/Cli/CreateThemeTest.php b/tests/WebFiori/Framework/Tests/Cli/CreateThemeTest.php index dc8bf311b..c3e66729a 100644 --- a/tests/WebFiori/Framework/Tests/Cli/CreateThemeTest.php +++ b/tests/WebFiori/Framework/Tests/Cli/CreateThemeTest.php @@ -1,10 +1,10 @@ executeSingleCommand(new CreateCommand(), [ - 'webfiori', + 'WebFiori', 'create' ], [ '6', @@ -60,14 +60,14 @@ public function testCreateTheme00() { */ public function testCreateThemeWithExistingName() { $runner = App::getRunner(); - $ns = '\\themes\\fioriTheme'; + $ns = '\\Themes\\FioriTheme'; $name = 'NewFTestTheme'; $ns2 = '\\themes\\cool'; $name2 = 'NewFTestTheme'; $output = $this->executeSingleCommand(new CreateCommand(), [ - 'webfiori', + 'WebFiori', 'create' ], [ '6', diff --git a/tests/WebFiori/Framework/Tests/Cli/CreateWebServiceTest.php b/tests/WebFiori/Framework/Tests/Cli/CreateWebServiceTest.php index 092738710..f620ee3e0 100644 --- a/tests/WebFiori/Framework/Tests/Cli/CreateWebServiceTest.php +++ b/tests/WebFiori/Framework/Tests/Cli/CreateWebServiceTest.php @@ -1,8 +1,8 @@ executeSingleCommand(new CreateCommand(), [ - 'webfiori', + 'WebFiori', 'create' ], [ '2', @@ -55,7 +55,7 @@ public function test00() { "10: Database migration.\n", "11: Quit. <--\n", "Enter a name for the new class:\n", - "Enter an optional namespace for the class: Enter = 'app\apis'\n", + "Enter an optional namespace for the class: Enter = 'App\Apis'\n", "Enter a name for the new web service:\n", "Description:\n", "Request method:\n", @@ -91,9 +91,9 @@ public function test00() { "Info: Don't forget to add the service to a services manager.\n", ], $output); - $clazz = '\\app\\apis\\NewWebService'; + $clazz = '\\App\\Apis\\NewWebService'; $this->assertTrue(class_exists($clazz)); - $this->removeClass('\\app\\apis\\NewWebService'); + $this->removeClass('\\App\\Apis\\NewWebService'); $instance = new $clazz(); $instance instanceof AbstractWebService; $this->assertEquals('get-hello', $instance->getName()); @@ -120,7 +120,7 @@ public function test00() { */ public function test01() { $output = $this->executeSingleCommand(new CreateCommand(), [ - 'webfiori', + 'WebFiori', 'create', '--c' => 'web-service' ], [ @@ -144,7 +144,7 @@ public function test01() { $this->assertEquals(0, $this->getExitCode()); $this->assertEquals([ "Enter a name for the new class:\n", - "Enter an optional namespace for the class: Enter = 'app\apis'\n", + "Enter an optional namespace for the class: Enter = 'App\Apis'\n", "Enter a name for the new web service:\n", "Description:\n", "Request method:\n", @@ -190,9 +190,9 @@ public function test01() { "Info: Don't forget to add the service to a services manager.\n", ], $output); - $clazz = '\\app\\apis\\NewWeb2Service'; + $clazz = '\\App\\Apis\\NewWeb2Service'; $this->assertTrue(class_exists($clazz)); - $this->removeClass('\\app\\apis\\NewWeb2Service'); + $this->removeClass('\\App\\Apis\\NewWeb2Service'); $instance = new $clazz(); $instance instanceof AbstractWebService; $this->assertEquals('get-hello-2', $instance->getName()); @@ -219,7 +219,7 @@ public function test01() { */ public function test02() { $output = $this->executeSingleCommand(new CreateCommand(), [ - 'webfiori', + 'WebFiori', 'create', '--c' => 'web-service' ], [ @@ -243,7 +243,7 @@ public function test02() { $this->assertEquals(0, $this->getExitCode()); $this->assertEquals([ "Enter a name for the new class:\n", - "Enter an optional namespace for the class: Enter = 'app\apis'\n", + "Enter an optional namespace for the class: Enter = 'App\Apis'\n", "Enter a name for the new web service:\n", "Description:\n", "Request method:\n", @@ -289,7 +289,7 @@ public function test02() { "Info: Don't forget to add the service to a services manager.\n", ], $output); - $clazz = '\\app\\apis\\NewWeb3Service'; + $clazz = '\\App\\Apis\\NewWeb3Service'; $this->assertTrue(class_exists($clazz)); $this->removeClass($clazz); $instance = new $clazz(); diff --git a/tests/WebFiori/Framework/Tests/Cli/DBClassWritterTest.php b/tests/WebFiori/Framework/Tests/Cli/DBClassWritterTest.php index 2f520d683..f065feb56 100644 --- a/tests/WebFiori/Framework/Tests/Cli/DBClassWritterTest.php +++ b/tests/WebFiori/Framework/Tests/Cli/DBClassWritterTest.php @@ -1,11 +1,11 @@ getEntityMapper(); $mapper->setEntityName('CoolUser'); - $mapper->setNamespace('webfiori\\entity'); - $writter = new DBClassWriter('UserDBClass', 'webfiori\\db', $table); + $mapper->setNamespace('WebFiori\\entity'); + $writter = new DBClassWriter('UserDBClass', 'WebFiori\\db', $table); $writter->writeClass(); $this->assertTrue(class_exists($writter->getName(true))); $this->removeClass($writter->getName(true)); @@ -34,8 +34,8 @@ public function test01() { $table = new EmployeeInfoTable(); $mapper = $table->getEntityMapper(); $mapper->setEntityName('Employee'); - $mapper->setNamespace('webfiori\\entity'); - $writter = new DBClassWriter('EmployeeDB', 'webfiori\\db', $table); + $mapper->setNamespace('WebFiori\\entity'); + $writter = new DBClassWriter('EmployeeDB', 'WebFiori\\db', $table); $writter->writeClass(); $this->assertTrue(class_exists($writter->getName(true))); $this->removeClass($writter->getName(true)); @@ -48,8 +48,8 @@ public function test02() { $table = new PositionInfoTable(); $mapper = $table->getEntityMapper(); $mapper->setEntityName('Position'); - $mapper->setNamespace('webfiori\\entity'); - $writter = new DBClassWriter('PositionDB', 'webfiori\\db', $table); + $mapper->setNamespace('WebFiori\\entity'); + $writter = new DBClassWriter('PositionDB', 'WebFiori\\db', $table); $writter->writeClass(); $this->assertTrue(class_exists($writter->getName(true))); $this->removeClass($writter->getName(true)); @@ -60,7 +60,7 @@ public function test02() { */ public function test03() { $table = new PositionInfoTable(); - $writter = new DBClassWriter('PositionDB2', 'webfiori\\db', $table); + $writter = new DBClassWriter('PositionDB2', 'WebFiori\\db', $table); $writter->setConnection(' '); $this->assertNull($writter->getConnectionName()); $writter->setConnection('ok-connection'); diff --git a/tests/WebFiori/Framework/Tests/Cli/HelpCommandTest.php b/tests/WebFiori/Framework/Tests/Cli/HelpCommandTest.php index 299ee050e..917064faf 100644 --- a/tests/WebFiori/Framework/Tests/Cli/HelpCommandTest.php +++ b/tests/WebFiori/Framework/Tests/Cli/HelpCommandTest.php @@ -1,7 +1,7 @@ setInputs(); $runner->setArgsVector([ - 'webfiori', + 'WebFiori', 'list-routes' ]); $runner->start(); @@ -34,7 +34,7 @@ public function test01() { $runner = App::getRunner(); $runner->setInputs(); $runner->setArgsVector([ - 'webfiori', + 'WebFiori', 'list-routes' ]); Router::addRoute([ diff --git a/tests/WebFiori/Framework/Tests/Cli/ListThemesCommandTest.php b/tests/WebFiori/Framework/Tests/Cli/ListThemesCommandTest.php index 32f1c0657..53357ae3b 100644 --- a/tests/WebFiori/Framework/Tests/Cli/ListThemesCommandTest.php +++ b/tests/WebFiori/Framework/Tests/Cli/ListThemesCommandTest.php @@ -1,8 +1,8 @@ setInputs(); $runner->setArgsVector([ - 'webfiori', + 'WebFiori', 'list-themes' ]); $runner->start(); @@ -33,7 +33,7 @@ public function test01() { $runner = App::getRunner(); $runner->setInputs(); $runner->setArgsVector([ - 'webfiori', + 'WebFiori', 'list-themes', '--theme-name' => "New Super Theme" ]); @@ -54,7 +54,7 @@ public function test02() { $runner = App::getRunner(); $runner->setInputs(); $runner->setArgsVector([ - 'webfiori', + 'WebFiori', 'list-themes', '--theme-name="Not Exist"' ]); diff --git a/tests/WebFiori/Framework/Tests/Cli/RunMigrationsCommandTest.php b/tests/WebFiori/Framework/Tests/Cli/RunMigrationsCommandTest.php index bdb059c82..0a8adc45b 100644 --- a/tests/WebFiori/Framework/Tests/Cli/RunMigrationsCommandTest.php +++ b/tests/WebFiori/Framework/Tests/Cli/RunMigrationsCommandTest.php @@ -1,11 +1,11 @@ removeAllDBConnections(); $output = $this->executeSingleCommand(new RunSQLQueryCommand(), [ - 'webfiori', + 'WebFiori', 'run-query', '--connection' => 'testing-connection', '--no-confirm', @@ -105,7 +105,7 @@ public function testQueryFromFile01() { App::getConfig()->addOrUpdateDBConnection($conn); $output = $this->executeSingleCommand(new RunSQLQueryCommand(), [ - 'webfiori', + 'WebFiori', 'run-query', '--connection' => 'testing-connection', '--no-confirm', @@ -130,7 +130,7 @@ public function testQueryFromFile02() { 'run-query', '--connection' => 'testing-connection', '--no-confirm', - '--file' => 'app\\database\\Test2Table.php' + '--file' => 'App\\Database\\Test2Table.php' ], []); $this->assertEquals(-1, $this->getExitCode()); @@ -151,7 +151,7 @@ public function testQueryFromFile03() { 'run-query', '--connection' => 'testing-connection', '--no-confirm', - '--file' => 'app\\database\\sql-file.sql' + '--file' => 'App\\Database\\sql-file.sql' ], []); $this->assertEquals(0, $this->getExitCode()); diff --git a/tests/WebFiori/Framework/Tests/Cli/SchedulerCommandTest.php b/tests/WebFiori/Framework/Tests/Cli/SchedulerCommandTest.php index 223cfd540..9bb2d5fdb 100644 --- a/tests/WebFiori/Framework/Tests/Cli/SchedulerCommandTest.php +++ b/tests/WebFiori/Framework/Tests/Cli/SchedulerCommandTest.php @@ -1,9 +1,9 @@ executeSingleCommand(new SchedulerCommand(), [ - 'webfiori', + 'WebFiori', 'scheduler', ], []); @@ -39,7 +39,7 @@ public function testCheckScheduledTasks() { TasksManager::setPassword('123456'); $output = $this->executeSingleCommand(new SchedulerCommand(), [ - 'webfiori', + 'WebFiori', 'scheduler', '--check', 'p' => '123456' @@ -63,7 +63,7 @@ public function testCheckScheduledTasks() { */ public function testCheckWithoutPassword() { $output = $this->executeSingleCommand(new SchedulerCommand(), [ - 'webfiori', + 'WebFiori', 'scheduler', '--check', ], []); @@ -80,7 +80,7 @@ public function testCheckWithoutPassword() { public function testForceTaskExecution() { $output = $this->executeSingleCommand(new SchedulerCommand(), [ - 'webfiori', + 'WebFiori', 'scheduler', '--force', 'p' => '123456' @@ -111,7 +111,7 @@ public function testForceTaskExecution() { */ public function testForceTaskWithLogging() { $output = $this->executeSingleCommand(new SchedulerCommand(), [ - 'webfiori', + 'WebFiori', 'scheduler', '--force', '--show-log', @@ -132,11 +132,11 @@ public function testForceTaskWithLogging() { "Running task(s) check...\n", "Forcing task 'Fail 1' to execute...\n", "Active task: \"Fail 1\" ...\n", - "Calling the method app\\tasks\Fail1TestTask::execute()\n", + "Calling the method App\\Tasks\Fail1TestTask::execute()\n", "Info: Task Fail 1 Is executing...\n", - "Calling the method app\\tasks\Fail1TestTask::onFail()\n", + "Calling the method App\\Tasks\Fail1TestTask::onFail()\n", "Error: Task Fail 1 Failed.\n", - "Calling the method app\\tasks\Fail1TestTask::afterExec()\n", + "Calling the method App\\Tasks\Fail1TestTask::afterExec()\n", "Check finished.\n", "Total number of tasks: 5\n", "Executed Tasks: 1\n", @@ -152,7 +152,7 @@ public function testForceTaskWithLogging() { */ public function testForceTaskWithExceptionLogging() { $output = $this->executeSingleCommand(new SchedulerCommand(), [ - 'webfiori', + 'WebFiori', 'scheduler', '--force', '--show-log', @@ -173,20 +173,20 @@ public function testForceTaskWithExceptionLogging() { "Running task(s) check...\n", "Forcing task 'Fail 2' to execute...\n", "Active task: \"Fail 2\" ...\n", - "Calling the method app\\tasks\Fail2TestTask::execute()\n", - "WARNING: An exception was thrown while performing the operation app\\tasks\Fail2TestTask::execute. The output of the task might be not as expected.\n", + "Calling the method App\\Tasks\Fail2TestTask::execute()\n", + "WARNING: An exception was thrown while performing the operation App\\Tasks\Fail2TestTask::execute. The output of the task might be not as expected.\n", "Exception class: Error\n", - "Exception message: Call to undefined method app\\tasks\Fail2TestTask::undefined()\n", + "Exception message: Call to undefined method App\\Tasks\Fail2TestTask::undefined()\n", "Thrown in: Fail2TestTask", "Line: 44", "Stack Trace:", - "#0 At class webfiori\\framework\\scheduler\\AbstractTask Line:", - "#1 At class webfiori\\framework\\scheduler\\AbstractTask Line:", - "#2 At class webfiori\\framework\\scheduler\\AbstractTask Line:", - "#3 At class webfiori\\framework\\scheduler\\TasksManager Line:", - "#4 At class webfiori\\framework\\scheduler\\TasksManager Line:", - "#5 At class webfiori\\framework\\cli\\commands\\SchedulerCommand Line:", - "#6 At class webfiori\\framework\\cli\\commands\\SchedulerCommand Line:", + "#0 At class WebFiori\\Framework\\Scheduler\\AbstractTask Line:", + "#1 At class WebFiori\\Framework\\Scheduler\\AbstractTask Line:", + "#2 At class WebFiori\\Framework\\Scheduler\\AbstractTask Line:", + "#3 At class WebFiori\\Framework\\Scheduler\\TasksManager Line:", + "#4 At class WebFiori\\Framework\\Scheduler\\TasksManager Line:", + "#5 At class WebFiori\\Framework\\Cli\\Commands\\SchedulerCommand Line:", + "#6 At class WebFiori\\Framework\\Cli\\Commands\\SchedulerCommand Line:", "#7 At class WebFiori\\Cli\\Command Line:", "#8 At class WebFiori\\Cli\\Runner Line:", "#9 At class WebFiori\\Cli\\Runner Line:", @@ -210,7 +210,7 @@ public function testForceTaskWithExceptionLogging() { public function testForceSpecificTaskByName() { $this->getRunner(true); $output = $this->executeSingleCommand(new SchedulerCommand(), [ - 'webfiori', + 'WebFiori', 'scheduler', '--force', '--show-log', @@ -226,12 +226,12 @@ public function testForceSpecificTaskByName() { "Running task(s) check...\n", "Forcing task 'Success 1' to execute...\n", "Active task: \"Success 1\" ...\n", - "Calling the method app\\tasks\SuccessTestTask::execute()\n", + "Calling the method App\\Tasks\SuccessTestTask::execute()\n", "Start: 2021-07-08\n", "End: \n", "The task was forced.\n", - "Calling the method app\\tasks\SuccessTestTask::onSuccess()\n", - "Calling the method app\\tasks\SuccessTestTask::afterExec()\n", + "Calling the method App\\Tasks\SuccessTestTask::onSuccess()\n", + "Calling the method App\\Tasks\SuccessTestTask::afterExec()\n", "Check finished.\n", "Total number of tasks: 5\n", "Executed Tasks: 1\n", @@ -249,7 +249,7 @@ public function testForceTaskWithCustomArguments() { TasksManager::execLog(true); $this->getRunner(true); $output = $this->executeSingleCommand(new SchedulerCommand(), [ - 'webfiori', + 'WebFiori', 'scheduler', '--force', '--show-log', @@ -267,12 +267,12 @@ public function testForceTaskWithCustomArguments() { "Running task(s) check...\n", "Forcing task 'Success 1' to execute...\n", "Active task: \"Success 1\" ...\n", - "Calling the method app\\tasks\SuccessTestTask::execute()\n", + "Calling the method App\\Tasks\SuccessTestTask::execute()\n", "Start: 2021\n", "End: 2022\n", "The task was forced.\n", - "Calling the method app\\tasks\SuccessTestTask::onSuccess()\n", - "Calling the method app\\tasks\SuccessTestTask::afterExec()\n", + "Calling the method App\\Tasks\SuccessTestTask::onSuccess()\n", + "Calling the method App\\Tasks\SuccessTestTask::afterExec()\n", "Check finished.\n", "Total number of tasks: 5\n", "Executed Tasks: 1\n", @@ -293,7 +293,7 @@ public function testForceTaskWithIncorrectPassword() { TasksManager::registerTasks(); $output = $this->executeSingleCommand(new SchedulerCommand(), [ - 'webfiori', + 'WebFiori', 'scheduler', '--force', '--task-name' => 'Success 1', @@ -318,7 +318,7 @@ public function testForceTaskWithIncorrectPassword() { */ public function testShowTaskArguments() { $output = $this->executeSingleCommand(new SchedulerCommand(), [ - 'webfiori', + 'WebFiori', 'scheduler', '--task-name' => 'Success 1', '--show-task-args', @@ -338,7 +338,7 @@ public function testShowTaskArguments() { */ public function testShowTaskArgumentsWithSelection() { $output = $this->executeSingleCommand(new SchedulerCommand(), [ - 'webfiori', + 'WebFiori', 'scheduler', '--show-task-args', 'p' => '123456' @@ -364,7 +364,7 @@ public function testShowTaskArgumentsWithSelection() { */ public function testListAllScheduledTasks() { $output = $this->executeSingleCommand(new SchedulerCommand(), [ - 'webfiori', + 'WebFiori', 'scheduler', '--list' ], []); @@ -396,7 +396,7 @@ public function testListAllScheduledTasks() { public function testCheckWithValidPassword() { TasksManager::setPassword('123456'); $output = $this->executeSingleCommand(new SchedulerCommand(), [ - 'webfiori', + 'WebFiori', 'scheduler', '--check', 'p' => '123456' @@ -425,7 +425,7 @@ public function testForceTaskWithInteractiveArguments() { TasksManager::registerTasks(); $output = $this->executeSingleCommand(new SchedulerCommand(), [ - 'webfiori', + 'WebFiori', 'scheduler', '--force', '--task-name' => 'Success 1', @@ -454,9 +454,9 @@ public function testForceTaskWithInteractiveArguments() { 'Running task(s) check...', "Forcing task 'Success 1' to execute...", "Active task: \"Success 1\" ...", - "Calling the method app\\tasks\SuccessTestTask::execute()", - "Calling the method app\\tasks\SuccessTestTask::onSuccess()", - "Calling the method app\\tasks\SuccessTestTask::afterExec()", + "Calling the method App\\Tasks\SuccessTestTask::execute()", + "Calling the method App\\Tasks\SuccessTestTask::onSuccess()", + "Calling the method App\\Tasks\SuccessTestTask::afterExec()", "Check finished.", ], TasksManager::getLogArray()); } @@ -466,7 +466,7 @@ public function testForceTaskWithInteractiveArguments() { */ public function testCancelTaskSelection() { $output = $this->executeSingleCommand(new SchedulerCommand(), [ - 'webfiori', + 'WebFiori', 'scheduler', '--force', 'p' => '123456' @@ -491,7 +491,7 @@ public function testCancelTaskSelection() { */ public function testForceNonExistentTask() { $output = $this->executeSingleCommand(new SchedulerCommand(), [ - 'webfiori', + 'WebFiori', 'scheduler', '--force', '--task-name="Rand"', diff --git a/tests/WebFiori/Framework/Tests/Cli/SettingsCommandTest.php b/tests/WebFiori/Framework/Tests/Cli/SettingsCommandTest.php index 3f8344780..1ffe500b8 100644 --- a/tests/WebFiori/Framework/Tests/Cli/SettingsCommandTest.php +++ b/tests/WebFiori/Framework/Tests/Cli/SettingsCommandTest.php @@ -1,9 +1,9 @@ setInputs(); $runner->setArgsVector([ - 'webfiori', + 'WebFiori', 'show-settings' ]); $runner->start(); diff --git a/tests/WebFiori/Framework/Tests/Cli/UpdateSettingsCommandTest.php b/tests/WebFiori/Framework/Tests/Cli/UpdateSettingsCommandTest.php index 83b866786..43538d969 100644 --- a/tests/WebFiori/Framework/Tests/Cli/UpdateSettingsCommandTest.php +++ b/tests/WebFiori/Framework/Tests/Cli/UpdateSettingsCommandTest.php @@ -1,11 +1,11 @@ initialize(true); $runner = App::getRunner(); $runner->setArgsVector([ - 'webfiori', + 'WebFiori', 'update-settings', '--w' => 'q' ]); @@ -44,7 +44,7 @@ public function testUpdateAppName00() { 'Super App', ]); $runner->setArgsVector([ - 'webfiori', + 'WebFiori', 'update-settings', '--w' => 'app-name' ]); @@ -73,7 +73,7 @@ public function testUpdateAppName01() { ]); $runner->setArgsVector([ - 'webfiori', + 'WebFiori', 'update-settings', '--w' => 'app-name' ]); @@ -109,7 +109,7 @@ public function testUpdateAppName02() { ]); $runner->setArgsVector([ - 'webfiori', + 'WebFiori', 'update-settings', '--w' => 'app-name' ]); @@ -137,7 +137,7 @@ public function testUpdateHomePage00() { $runner->setInputs(); $runner->setArgsVector([ - 'webfiori', + 'WebFiori', 'update-settings', '--w' => 'home-page' ]); @@ -161,7 +161,7 @@ public function testUpdateHomePage01() { ]); $runner->setArgsVector([ - 'webfiori', + 'WebFiori', 'update-settings', '--w' => 'home-page' ]); @@ -185,7 +185,7 @@ public function testUpdatePageDescription00() { ]); $runner->setArgsVector([ - 'webfiori', + 'WebFiori', 'update-settings', '--w' => 'page-description' ]); @@ -211,7 +211,7 @@ public function testUpdatePageTitle00() { ]); $runner->setArgsVector([ - 'webfiori', + 'WebFiori', 'update-settings', '--w' => 'page-title' ]); @@ -229,7 +229,7 @@ public function testUpdatePageTitle00() { public function testUpdatePrimaryLang() { $runner = App::getRunner(); $runner->setArgsVector([ - 'webfiori', + 'WebFiori', 'update-settings', '--w' => 'primary-lang' ]); @@ -254,7 +254,7 @@ public function testUpdatePrimaryLang00() { 'NEW PAGE DESCRIPTION' ]); $runner->setArgsVector([ - 'webfiori', + 'WebFiori', 'update-settings', '--w' => 'page-description' ]); @@ -275,11 +275,11 @@ public function testUpdatePrimaryLang00() { public function testUpdatePrimaryTheme00() { $runner = App::getRunner(); $runner->setInputs([ - 'themes\\fioriTheme2\\NewTestTheme2' + 'Themes\\FioriTheme2\\NewTestTheme2' ]); $runner->setArgsVector([ - 'webfiori', + 'WebFiori', 'update-settings', '--w' => 'theme' ]); @@ -290,7 +290,7 @@ public function testUpdatePrimaryTheme00() { "Success: Theme successfully updated.\n" ], $runner->getOutput()); - $this->assertEquals('themes\\fioriTheme2\\NewTestTheme2', App::getConfig()->getTheme()); + $this->assertEquals('Themes\\FioriTheme2\\NewTestTheme2', App::getConfig()->getTheme()); } /** * @test @@ -300,10 +300,10 @@ public function testUpdatePrimaryTheme01() { $runner->setInputs([ 'themes\\greeny\\NotATheme', '', - 'themes\\fioriTheme2\\NewTestTheme2' + 'Themes\\FioriTheme2\\NewTestTheme2' ]); $runner->setArgsVector([ - 'webfiori', + 'WebFiori', 'update-settings', '--w' => 'theme' ]); @@ -318,7 +318,7 @@ public function testUpdatePrimaryTheme01() { "Success: Theme successfully updated.\n" ], $runner->getOutput()); - $this->assertEquals('themes\\fioriTheme2\\NewTestTheme2', App::getConfig()->getTheme()); + $this->assertEquals('Themes\\FioriTheme2\\NewTestTheme2', App::getConfig()->getTheme()); } /** * @test @@ -326,11 +326,11 @@ public function testUpdatePrimaryTheme01() { public function testUpdatePrimaryTheme02() { $runner = App::getRunner(); $runner->setInputs([ - 'webfiori\\framework\\Privilege', - 'themes\\fioriTheme2\\NewTestTheme2' + 'WebFiori\\Framework\\Privilege', + 'Themes\\FioriTheme2\\NewTestTheme2' ]); $runner->setArgsVector([ - 'webfiori', + 'WebFiori', 'update-settings', '--w' => 'theme' ]); @@ -343,7 +343,7 @@ public function testUpdatePrimaryTheme02() { "Success: Theme successfully updated.\n" ], $runner->getOutput()); - $this->assertEquals('themes\\fioriTheme2\\NewTestTheme2', App::getConfig()->getTheme()); + $this->assertEquals('Themes\\FioriTheme2\\NewTestTheme2', App::getConfig()->getTheme()); } /** * @test @@ -351,11 +351,11 @@ public function testUpdatePrimaryTheme02() { public function testUpdatePrimaryTheme03() { $runner = App::getRunner(); $runner->setInputs([ - 'webfiori\\framework\\App', - 'themes\\fioriTheme2\\NewTestTheme2' + 'WebFiori\\Framework\\App', + 'Themes\\FioriTheme2\\NewTestTheme2' ]); $runner->setArgsVector([ - 'webfiori', + 'WebFiori', 'update-settings', '--w' => 'theme' ]); @@ -368,7 +368,7 @@ public function testUpdatePrimaryTheme03() { "Success: Theme successfully updated.\n" ], $runner->getOutput()); - $this->assertEquals('themes\\fioriTheme2\\NewTestTheme2', App::getConfig()->getTheme()); + $this->assertEquals('Themes\\FioriTheme2\\NewTestTheme2', App::getConfig()->getTheme()); } /** * @test @@ -380,7 +380,7 @@ public function testUpdateSchedulerPass00() { ]); $runner->setArgsVector([ - 'webfiori', + 'WebFiori', 'update-settings', '--w' => 'scheduler-pass', ]); @@ -403,7 +403,7 @@ public function testUpdateSchedulerPass01() { ]); $runner->setArgsVector([ - 'webfiori', + 'WebFiori', 'update-settings', '--w' => 'scheduler-pass', ]); @@ -428,7 +428,7 @@ public function testUpdateTitleSep00() { ]); $runner->setArgsVector([ - 'webfiori', + 'WebFiori', 'update-settings', '--w' => 'xyz' ]); @@ -458,7 +458,7 @@ public function testUpdateTitleSep00() { public function testUpdateVersion00() { $runner = App::getRunner(); $runner->setArgsVector([ - 'webfiori', + 'WebFiori', 'update-settings', '--w' => 'version' ]); diff --git a/tests/WebFiori/Framework/Tests/Cli/UpdateTableCommandTest.php b/tests/WebFiori/Framework/Tests/Cli/UpdateTableCommandTest.php index 722f5d1d8..8171040fd 100644 --- a/tests/WebFiori/Framework/Tests/Cli/UpdateTableCommandTest.php +++ b/tests/WebFiori/Framework/Tests/Cli/UpdateTableCommandTest.php @@ -1,20 +1,20 @@ executeSingleCommand(new UpdateTableCommand(), [ - 'webfiori', + 'WebFiori', 'update-table', ], [ ' ', // Invalid class name 'ok\\y\\Super', // Invalid class name - 'app\\database\\TestTable', + 'App\\Database\\TestTable', '0', 'new-col', '1', @@ -70,11 +70,11 @@ public function test00() { "Enter your optional comment about the column:\n", "Would you like to update same class or create a copy with the update?(y/N)\n", "Enter a name for the new class:\n", - "Enter an optional namespace for the class: Enter = 'app\database'\n", + "Enter an optional namespace for the class: Enter = 'App\Database'\n", "Success: Column added.\n", ], $output); - $clazz = '\\app\\database\\ModifiedOTable'; + $clazz = '\\App\\Database\\ModifiedOTable'; $this->assertTrue(class_exists($clazz)); $file = new File(ROOT_PATH.$clazz.'.php'); $file->remove(); @@ -91,10 +91,10 @@ public function test00() { */ public function test01() { $output = $this->executeSingleCommand(new UpdateTableCommand(), [ - 'webfiori', + 'WebFiori', 'update-table', ], [ - 'app\\database\\TestTable', + 'App\\Database\\TestTable', '2', 'id', 'user-id', @@ -149,11 +149,11 @@ public function test01() { "Enter your optional comment about the column:\n", "Would you like to update same class or create a copy with the update?(y/N)\n", "Enter a name for the new class:\n", - "Enter an optional namespace for the class: Enter = 'app\database'\n", + "Enter an optional namespace for the class: Enter = 'App\Database'\n", "Success: Column updated.\n", ], $output); - $clazz = '\\app\\database\\ModifiedTable'; + $clazz = '\\App\\Database\\ModifiedTable'; $this->assertTrue(class_exists($clazz)); $file = new File(ROOT_PATH.$clazz.'.php'); $file->remove(); @@ -167,10 +167,10 @@ public function test01() { public function test02() { $output = $this->executeSingleCommand(new UpdateTableCommand(), [ - 'webfiori', + 'WebFiori', 'update-table', ], [ - 'app\\database\\Test2Table', + 'App\\Database\\Test2Table', '4', '0', 'y', @@ -191,11 +191,11 @@ public function test02() { "0: user_id_fk\n", "Would you like to update same class or create a copy with the update?(y/N)\n", "Enter a name for the new class:\n", - "Enter an optional namespace for the class: Enter = 'app\database'\n", + "Enter an optional namespace for the class: Enter = 'App\Database'\n", "Success: Table updated.\n", ], $output); - $clazz = '\\app\\database\\Modified2Table'; + $clazz = '\\App\\Database\\Modified2Table'; $this->assertTrue(class_exists($clazz)); $file = new File(ROOT_PATH.$clazz.'.php'); $file->remove(); diff --git a/tests/WebFiori/Framework/Tests/Cli/VersionCommandTest.php b/tests/WebFiori/Framework/Tests/Cli/VersionCommandTest.php index 4bdb4baa5..d40a98a80 100644 --- a/tests/WebFiori/Framework/Tests/Cli/VersionCommandTest.php +++ b/tests/WebFiori/Framework/Tests/Cli/VersionCommandTest.php @@ -1,8 +1,8 @@ expectException(Exception::class); - $this->expectExceptionMessage('A language class for the language \'FR\' was found. But it is not a sub class of \'webfiori\framework\Lang\'.'); + $this->expectExceptionMessage('A language class for the language \'FR\' was found. But it is not a sub class of \'WebFiori\framework\Lang\'.'); Lang::loadTranslation('fr'); } /** @@ -221,7 +221,7 @@ public function testLoadTranslation02() { */ public function testLoadTranslation03() { $this->expectException(Exception::class); - $this->expectExceptionMessage('The translation file was found. But no object of type \'webfiori\framework\Lang\' is stored. Make sure that the parameter ' + $this->expectExceptionMessage('The translation file was found. But no object of type \'WebFiori\framework\Lang\' is stored. Make sure that the parameter ' .'$addtoLoadedAfterCreate is set to true when creating the language object.'); Lang::loadTranslation('Jp'); } diff --git a/tests/WebFiori/Framework/Tests/Mail/EmailMessageTest.php b/tests/WebFiori/Framework/Tests/Mail/EmailMessageTest.php index ec3f159e4..03cedf51e 100644 --- a/tests/WebFiori/Framework/Tests/Mail/EmailMessageTest.php +++ b/tests/WebFiori/Framework/Tests/Mail/EmailMessageTest.php @@ -1,14 +1,14 @@ setTheme(' New Super Theme '); $theme3 = $page->getTheme(); - $this->assertTrue($theme3 instanceof \webfiori\framework\Theme); + $this->assertTrue($theme3 instanceof \WebFiori\framework\Theme); } /** * @test diff --git a/tests/WebFiori/Framework/Tests/PrivilegeTest.php b/tests/WebFiori/Framework/Tests/PrivilegeTest.php index b5e976293..dfb71ba8c 100644 --- a/tests/WebFiori/Framework/Tests/PrivilegeTest.php +++ b/tests/WebFiori/Framework/Tests/PrivilegeTest.php @@ -1,10 +1,10 @@ expectException(InvalidArgumentException::class); - $this->expectExceptionMessage("Invalid argument type. Expected 'string' or 'webfiori\\framework\\scheduler\\TaskArgument'"); + $this->expectExceptionMessage("Invalid argument type. Expected 'string' or 'WebFiori\\Framework\\Scheduler\\TaskArgument'"); $job = new BaseTask(); $job->addExecutionArg(new Privilege()); } diff --git a/tests/WebFiori/Framework/Tests/Scheduler/SchedulerTest.php b/tests/WebFiori/Framework/Tests/Scheduler/SchedulerTest.php index 396f0bf3d..e3a136314 100644 --- a/tests/WebFiori/Framework/Tests/Scheduler/SchedulerTest.php +++ b/tests/WebFiori/Framework/Tests/Scheduler/SchedulerTest.php @@ -1,12 +1,12 @@ assertEquals('NewTask', $writter->getName()); - $this->assertEquals('app\\tasks', $writter->getNamespace()); + $this->assertEquals('App\\Tasks', $writter->getNamespace()); $this->assertEquals('Task', $writter->getSuffix()); $this->assertEquals([ - "webfiori\\framework\\scheduler\\AbstractTask", - "webfiori\\framework\\scheduler\\TaskStatusEmail", - "webfiori\\framework\\scheduler\\TasksManager", + "WebFiori\\Framework\\Scheduler\\AbstractTask", + "WebFiori\\Framework\\Scheduler\\TaskStatusEmail", + "WebFiori\\Framework\\Scheduler\\TasksManager", ], $writter->getUseStatements()); $this->assertEquals('No Description', $writter->getTaskDescription()); $this->assertEquals(0, count($writter->getTask()->getArguments())); @@ -33,12 +33,12 @@ public function test01() { $writter = new SchedulerTaskClassWriter(); $writter->setClassName('NewOk'); $this->assertEquals('NewOkTask', $writter->getName()); - $this->assertEquals('app\\tasks', $writter->getNamespace()); + $this->assertEquals('App\\Tasks', $writter->getNamespace()); $this->assertEquals('Task', $writter->getSuffix()); $this->assertEquals([ - "webfiori\\framework\\scheduler\\AbstractTask", - "webfiori\\framework\\scheduler\\TaskStatusEmail", - "webfiori\\framework\\scheduler\\TasksManager", + "WebFiori\\Framework\\Scheduler\\AbstractTask", + "WebFiori\\Framework\\Scheduler\\TaskStatusEmail", + "WebFiori\\Framework\\Scheduler\\TasksManager", ], $writter->getUseStatements()); $this->assertEquals('No Description', $writter->getTaskDescription()); $this->assertEquals(0, count($writter->getTask()->getArguments())); @@ -63,12 +63,12 @@ public function test02() { $this->assertEquals('NewOk2BTask', $writter->getName()); - $this->assertEquals('app\\tasks', $writter->getNamespace()); + $this->assertEquals('App\\Tasks', $writter->getNamespace()); $this->assertEquals('Task', $writter->getSuffix()); $this->assertEquals([ - "webfiori\\framework\\scheduler\\AbstractTask", - "webfiori\\framework\\scheduler\\TaskStatusEmail", - "webfiori\\framework\\scheduler\\TasksManager", + "WebFiori\\Framework\\Scheduler\\AbstractTask", + "WebFiori\\Framework\\Scheduler\\TaskStatusEmail", + "WebFiori\\Framework\\Scheduler\\TasksManager", ], $writter->getUseStatements()); $this->assertEquals('A test Task', $writter->getTaskDescription()); $this->assertEquals(1, count($writter->getTask()->getArguments())); diff --git a/tests/WebFiori/Framework/Tests/Writers/CLICommandClassWriterTest.php b/tests/WebFiori/Framework/Tests/Writers/CLICommandClassWriterTest.php index 8d88d7d86..3541f1c1c 100644 --- a/tests/WebFiori/Framework/Tests/Writers/CLICommandClassWriterTest.php +++ b/tests/WebFiori/Framework/Tests/Writers/CLICommandClassWriterTest.php @@ -1,9 +1,9 @@ removeClass($clazz); $runner = new SchemaRunner(null); $writter = new DatabaseMigrationWriter($runner); $this->assertEquals('Migration000', $writter->getName()); - $this->assertEquals('app\\database\\migrations', $writter->getNamespace()); + $this->assertEquals('App\\Database\\migrations', $writter->getNamespace()); $this->assertEquals('', $writter->getSuffix()); $this->assertEquals([ "WebFiori\Database\Database", @@ -53,7 +53,7 @@ public function test00() { $this->assertEquals(1, count($migrations)); $m00 = $migrations[0]; $this->assertTrue($m00 instanceof AbstractMigration); - $this->assertEquals('app\\database\\migrations\\Migration000', $m00->getName()); + $this->assertEquals('App\\Database\\migrations\\Migration000', $m00->getName()); $this->removeClass($clazz); $runner = new SchemaRunner(null); } @@ -64,14 +64,14 @@ public function test01() { DatabaseMigrationWriter::resetCounter(); $runner = new SchemaRunner(null); $path = APP_PATH.DS.'database'.DS.'migrations'; - $ns = '\\app\\database\\migrations'; + $ns = '\\App\\Database\\migrations'; $writter = new DatabaseMigrationWriter($runner); $writter->setClassName('MyMigration'); $this->assertEquals('MyMigration', $writter->getName()); - $this->assertEquals('app\\database\\migrations', $writter->getNamespace()); + $this->assertEquals('App\\Database\\migrations', $writter->getNamespace()); $writter->writeClass(); - $clazz = "\\app\\database\\migrations\\MyMigration"; + $clazz = "\\App\\Database\\migrations\\MyMigration"; $this->assertTrue(class_exists($clazz)); $runner->register($clazz); $allClasses[] = $clazz; @@ -79,7 +79,7 @@ public function test01() { $this->assertEquals(1, count($migrations)); $m00 = $migrations[0]; $this->assertTrue($m00 instanceof AbstractMigration); - $this->assertEquals('app\\database\\migrations\\MyMigration', $m00->getName()); + $this->assertEquals('App\\Database\\migrations\\MyMigration', $m00->getName()); $this->removeClass($clazz); $runner = new SchemaRunner(null); } @@ -90,11 +90,11 @@ public function test02() { DatabaseMigrationWriter::resetCounter(); $runner = new SchemaRunner(null); $path = APP_PATH.DS.'database'.DS.'migrations'; - $ns = '\\app\\database\\migrations'; + $ns = '\\App\\Database\\migrations'; $writter = new DatabaseMigrationWriter($runner); $this->assertEquals('Migration000', $writter->getName()); $writter->writeClass(); - $clazz = "\\app\\database\\migrations\\Migration000"; + $clazz = "\\App\\Database\\migrations\\Migration000"; $this->assertTrue(class_exists($clazz)); $runner->register($clazz); $allClasses[] = $clazz; @@ -104,12 +104,12 @@ public function test02() { $this->assertEquals(1, count($migrations)); $m00 = $migrations[0]; $this->assertTrue($m00 instanceof AbstractMigration); - $this->assertEquals('app\\database\\migrations\\Migration000', $m00->getName()); + $this->assertEquals('App\\Database\\migrations\\Migration000', $m00->getName()); $writter2 = new DatabaseMigrationWriter($runner2); $this->assertEquals('Migration001', $writter2->getName()); $writter2->writeClass(); - $clazz2 = "\\app\\database\\migrations\\Migration001"; + $clazz2 = "\\App\\Database\\migrations\\Migration001"; $this->assertTrue(class_exists($clazz)); $runner->register($clazz); $allClasses[] = $clazz; @@ -120,7 +120,7 @@ public function test02() { $this->assertEquals(2, count($migrations2)); $m01 = $migrations2[1]; $this->assertTrue($m00 instanceof AbstractMigration); - $this->assertEquals('app\\database\\migrations\\Migration001', $m01->getName()); + $this->assertEquals('App\\Database\\migrations\\Migration001', $m01->getName()); $this->removeClass($clazz); $runner = new SchemaRunner(null); $this->removeClass($clazz2); @@ -132,7 +132,7 @@ public function test03() { DatabaseMigrationWriter::resetCounter(); $runner = new SchemaRunner(null); $path = APP_PATH.DS.'database'.DS.'migrations'; - $ns = '\\app\\database\\migrations'; + $ns = '\\App\\Database\\migrations'; $allClasses = []; for ($x = 0 ; $x < 110 ; $x++) { $writter = new DatabaseMigrationWriter($runner); @@ -145,7 +145,7 @@ public function test03() { } $this->assertEquals($name, $writter->getName()); $writter->writeClass(); - $clazz = "\\app\\database\\migrations\\".$name; + $clazz = "\\App\\Database\\migrations\\".$name; $this->assertTrue(class_exists($clazz)); $runner->register($clazz); $allClasses[] = $clazz; @@ -158,10 +158,10 @@ public function test03() { $this->assertEquals($x + 1, count($migrations)); $m = $migrations[$x]; $this->assertTrue($m instanceof AbstractMigration); - $this->assertEquals("app\\database\\migrations\\" . $name, $m->getName()); + $this->assertEquals("App\\Database\\migrations\\" . $name, $m->getName()); } foreach ($migrations as $m) { - $this->removeClass("\\app\\database\\migrations\\".$m->getName()); + $this->removeClass("\\App\\Database\\migrations\\".$m->getName()); } } private function removeClass($classPath) { diff --git a/tests/WebFiori/Framework/Tests/Writers/LangWritterTest.php b/tests/WebFiori/Framework/Tests/Writers/LangWritterTest.php index 99cf77370..e4257d4f2 100644 --- a/tests/WebFiori/Framework/Tests/Writers/LangWritterTest.php +++ b/tests/WebFiori/Framework/Tests/Writers/LangWritterTest.php @@ -1,9 +1,9 @@ assertEquals('LangEN', $writter->getName()); - $this->assertEquals('app\\langs', $writter->getNamespace()); + $this->assertEquals('App\\Langs', $writter->getNamespace()); $this->assertEquals('', $writter->getSuffix()); $this->assertEquals([ Lang::class diff --git a/tests/WebFiori/Framework/Tests/Writers/MiddlewareWritterTest.php b/tests/WebFiori/Framework/Tests/Writers/MiddlewareWritterTest.php index 26b9fd894..9d91cbabc 100644 --- a/tests/WebFiori/Framework/Tests/Writers/MiddlewareWritterTest.php +++ b/tests/WebFiori/Framework/Tests/Writers/MiddlewareWritterTest.php @@ -1,9 +1,9 @@ assertEquals('NewMiddleware', $writter->getName()); - $this->assertEquals('app\\middleware', $writter->getNamespace()); + $this->assertEquals('App\\Middleware', $writter->getNamespace()); $this->assertEquals('Middleware', $writter->getSuffix()); $this->assertEquals([ - "webfiori\\framework\\middleware\\AbstractMiddleware", - "webfiori\\framework\\session\\SessionsManager", + "WebFiori\\Framework\\Middleware\\AbstractMiddleware", + "WebFiori\\Framework\\Session\\SessionsManager", "WebFiori\\Http\\Request", "WebFiori\\Http\\Response", ], $writter->getUseStatements()); @@ -39,11 +39,11 @@ public function test01() { $writter->addGroup('two-group'); $writter->addGroup('global'); $this->assertEquals('XMdMiddleware', $writter->getName()); - $this->assertEquals('app\\middleware', $writter->getNamespace()); + $this->assertEquals('App\\Middleware', $writter->getNamespace()); $this->assertEquals('Middleware', $writter->getSuffix()); $this->assertEquals([ - "webfiori\\framework\\middleware\\AbstractMiddleware", - "webfiori\\framework\\session\\SessionsManager", + "WebFiori\\Framework\\Middleware\\AbstractMiddleware", + "WebFiori\\Framework\\Session\\SessionsManager", "WebFiori\\Http\\Request", "WebFiori\\Http\\Response", ], $writter->getUseStatements()); diff --git a/tests/WebFiori/Framework/Tests/Writers/TableWritterTest.php b/tests/WebFiori/Framework/Tests/Writers/TableWritterTest.php index 966e6aa3f..05e37ec97 100644 --- a/tests/WebFiori/Framework/Tests/Writers/TableWritterTest.php +++ b/tests/WebFiori/Framework/Tests/Writers/TableWritterTest.php @@ -1,11 +1,11 @@ assertEquals('NewTable', $writter->getName()); - $this->assertEquals('app\\database', $writter->getNamespace()); + $this->assertEquals('App\\Database', $writter->getNamespace()); $this->assertEquals('Table', $writter->getSuffix()); $this->assertEquals([ @@ -34,15 +34,15 @@ public function test00() { public function test01() { $writter = new TableClassWriter(); $writter->setClassName('CoolT'); - $writter->setEntityInfo('MyEntity', 'app\\entity', ROOT_PATH.DS.APP_DIR.DS.'entity', true); + $writter->setEntityInfo('MyEntity', 'App\\Entity', ROOT_PATH.DS.APP_DIR.DS.'entity', true); $this->assertEquals('CoolTTable', $writter->getName()); - $this->assertEquals('app\\database', $writter->getNamespace()); + $this->assertEquals('App\\Database', $writter->getNamespace()); $this->assertEquals('Table', $writter->getSuffix()); $this->assertEquals([ ], $writter->getUseStatements()); $this->assertEquals('MyEntity', $writter->getEntityName()); - $this->assertEquals('app\\entity', $writter->getEntityNamespace()); + $this->assertEquals('App\\Entity', $writter->getEntityNamespace()); $this->assertEquals(ROOT_PATH.DS.APP_DIR.DS.'entity', $writter->getEntityPath()); $this->assertTrue($writter->getTable() instanceof MySQLTable); $this->assertFalse($writter->getTable() instanceof MSSQLTable); @@ -54,7 +54,7 @@ public function test01() { $this->assertTrue($clazzObj instanceof MySQLTable); $this->assertEquals('`new_table`', $clazzObj->getName()); $this->assertEquals(0, $clazzObj->getColsCount()); - $this->removeClass('app\\entity\\MyEntity'); + $this->removeClass('App\\Entity\\MyEntity'); } /** * @test @@ -63,7 +63,7 @@ public function test02() { $writter = new TableClassWriter(); $writter->setClassName('CoolT2Table'); $writter->setTableType('mssql'); - $writter->setEntityInfo('MyEntity', 'app\\entity', ROOT_PATH.DS.APP_DIR.DS.'entity', true); + $writter->setEntityInfo('MyEntity', 'App\\Entity', ROOT_PATH.DS.APP_DIR.DS.'entity', true); $this->assertEquals('CoolT2Table', $writter->getName()); $this->assertFalse($writter->getTable() instanceof MySQLTable); @@ -76,7 +76,7 @@ public function test02() { $this->assertTrue($clazzObj instanceof MSSQLTable); $this->assertEquals('[new_table]', $clazzObj->getName()); $this->assertEquals(0, $clazzObj->getColsCount()); - $this->removeClass('app\\entity\\MyEntity'); + $this->removeClass('App\\Entity\\MyEntity'); } /** * @test diff --git a/tests/WebFiori/Framework/Tests/Writers/ThemeWritterTest.php b/tests/WebFiori/Framework/Tests/Writers/ThemeWritterTest.php index a34a81687..5d695bb68 100644 --- a/tests/WebFiori/Framework/Tests/Writers/ThemeWritterTest.php +++ b/tests/WebFiori/Framework/Tests/Writers/ThemeWritterTest.php @@ -1,9 +1,9 @@ assertEquals('NewWebService', $writter->getName()); - $this->assertEquals('app\\apis', $writter->getNamespace()); + $this->assertEquals('App\\Apis', $writter->getNamespace()); $this->assertEquals('Service', $writter->getSuffix()); $this->assertEquals([ "WebFiori\Http\AbstractWebService", @@ -30,7 +30,7 @@ public function test01() { $writter = new WebServiceWriter(); $writter->setClassName('SuperService'); $this->assertEquals('SuperService', $writter->getName()); - $this->assertEquals('app\\apis', $writter->getNamespace()); + $this->assertEquals('App\\Apis', $writter->getNamespace()); $this->assertEquals('Service', $writter->getSuffix()); $this->assertEquals([ "WebFiori\Http\AbstractWebService", @@ -58,7 +58,7 @@ public function test02() { $writter = new WebServiceWriter(); $writter->setClassName('Super2Service'); $this->assertEquals('Super2Service', $writter->getName()); - $this->assertEquals('app\\apis', $writter->getNamespace()); + $this->assertEquals('App\\Apis', $writter->getNamespace()); $this->assertEquals('Service', $writter->getSuffix()); $this->assertEquals([ "WebFiori\Http\AbstractWebService", diff --git a/tests/bootstrap.php b/tests/bootstrap.php index cf9903efa..204332d08 100644 --- a/tests/bootstrap.php +++ b/tests/bootstrap.php @@ -9,12 +9,12 @@ use WebFiori\Database\ConnectionInfo; use WebFiori\Database\Schema\SchemaRunner; -use webfiori\framework\App; -use webfiori\framework\autoload\ClassLoader; -use webfiori\framework\config\JsonDriver; -use webfiori\framework\ThemeManager; -use themes\fioriTheme\NewFTestTheme; -use themes\fioriTheme2\NewTestTheme2; +use WebFiori\Framework\App; +use WebFiori\Framework\Autoload\ClassLoader; +use WebFiori\Framework\Config\JsonDriver; +use WebFiori\Framework\ThemeManager; +use Themes\FioriTheme\NewFTestTheme; +use Themes\FioriTheme2\NewTestTheme2; $DS = DIRECTORY_SEPARATOR; @@ -30,8 +30,8 @@ //WebFiori Framework might exist. //Add and remove directories as needed. $WebFioriFrameworkDirs = [ - __DIR__.$DS.'..'.$DS.'webfiori', - __DIR__.$DS.'..'.$DS.'vendor'.$DS.'webfiori'.$DS.'webfiori' + __DIR__.$DS.'..'.$DS.'WebFiori', + __DIR__.$DS.'..'.$DS.'vendor'.$DS.'WebFiori'.$DS.'WebFiori' ]; fprintf(STDOUT, "PHP Version: '".PHP_VERSION."'\n"); fprintf(STDOUT, "Version ID: '".PHP_VERSION_ID."'\n"); @@ -48,7 +48,7 @@ foreach ($WebFioriFrameworkDirs as $dir) { //linux - $file = $DS.$dir.'framework'.$DS.'autoload'.$DS.'ClassLoader.php'; + $file = $DS.$dir.$DS.'Framework'.$DS.'Autoload'.$DS.'ClassLoader.php'; fprintf(STDOUT,"Checking if file '$file' is exist...\n"); if (file_exists($file)) { @@ -62,7 +62,7 @@ foreach ($WebFioriFrameworkDirs as $dir) { //other - $file = $dir.$DS.'framework'.$DS.'autoload'.$DS.'ClassLoader.php'; + $file = $dir.$DS.'Framework'.$DS.'Autoload'.$DS.'ClassLoader.php'; fprintf(STDOUT,"Checking if file '$file' is exist...\n"); if (file_exists($file)) { @@ -83,9 +83,10 @@ ClassLoader::get([ 'search-folders' => [ 'tests', - 'webfiori', + 'WebFiori', 'vendor', - 'app' + 'app', + 'Themes' ], 'define-root' => true, 'root' => $ROOT, diff --git a/tests/phpunit.xml b/tests/phpunit.xml index 720bfee7f..c20d678c1 100644 --- a/tests/phpunit.xml +++ b/tests/phpunit.xml @@ -5,82 +5,82 @@ - ../webfiori/framework/Access.php - ../webfiori/framework/DB.php - ../webfiori/framework/Language.php + ../WebFiori/Framework/Access.php + ../WebFiori/Framework/DB.php + ../WebFiori/Framework/Language.php - ../webfiori/framework/config/JsonDriver.php - ../webfiori/framework/config/ClassDriver.php + ../WebFiori/Framework/config/JsonDriver.php + ../WebFiori/Framework/config/ClassDriver.php - ../webfiori/framework/Privilege.php - ../webfiori/framework/PrivilegesGroup.php - ../webfiori/framework/User.php - ../webfiori/framework/Theme.php + ../WebFiori/Framework/Privilege.php + ../WebFiori/Framework/PrivilegesGroup.php + ../WebFiori/Framework/User.php + ../WebFiori/Framework/Theme.php - ../webfiori/framework/ui/BeforeRenderCallback.php - ../webfiori/framework/ui/WebPage.php + ../WebFiori/Framework/ui/BeforeRenderCallback.php + ../WebFiori/Framework/ui/WebPage.php - ../webfiori/framework/scheduler/BaseTask.php - ../webfiori/framework/scheduler/AbstractTask.php - ../webfiori/framework/scheduler/TasksManager.php - ../webfiori/framework/scheduler/TaskArgument.php + ../WebFiori/Framework/scheduler/BaseTask.php + ../WebFiori/Framework/scheduler/AbstractTask.php + ../WebFiori/Framework/scheduler/TasksManager.php + ../WebFiori/Framework/scheduler/TaskArgument.php - ../webfiori/framework/router/RouterUri.php - ../webfiori/framework/router/Router.php + ../WebFiori/Framework/router/RouterUri.php + ../WebFiori/Framework/router/Router.php - ../webfiori/framework/middleware/AbstractMiddleware.php - ../webfiori/framework/middleware/MiddlewareManager.php - ../webfiori/framework/middleware/CacheMiddleware.php - ../webfiori/framework/middleware/StartSessionMiddleware.php + ../WebFiori/Framework/middleware/AbstractMiddleware.php + ../WebFiori/Framework/middleware/MiddlewareManager.php + ../WebFiori/Framework/middleware/CacheMiddleware.php + ../WebFiori/Framework/middleware/StartSessionMiddleware.php - ../webfiori/framework/session/Session.php - ../webfiori/framework/session/SessionsManager.php - ../webfiori/framework/session/DefaultSessionStorage.php - ../webfiori/framework/session/DatabaseSessionStorage.php - ../webfiori/framework/session/SessionDB.php + ../WebFiori/Framework/session/Session.php + ../WebFiori/Framework/session/SessionsManager.php + ../WebFiori/Framework/session/DefaultSessionStorage.php + ../WebFiori/Framework/session/DatabaseSessionStorage.php + ../WebFiori/Framework/session/SessionDB.php - ../webfiori/framework/cli/commands/AddCommand.php - ../webfiori/framework/cli/commands/CreateCommand.php - ../webfiori/framework/cli/commands/ListRoutesCommand.php - ../webfiori/framework/cli/commands/ListThemesCommand.php - ../webfiori/framework/cli/commands/RunSQLQueryCommand.php - ../webfiori/framework/cli/commands/SchedulerCommand.php - ../webfiori/framework/cli/commands/SettingsCommand.php - ../webfiori/framework/cli/commands/UpdateSettingsCommand.php - ../webfiori/framework/cli/commands/UpdateTableCommand.php - ../webfiori/framework/cli/commands/VersionCommand.php - ../webfiori/framework/cli/commands/WHelpCommand.php - ../webfiori/framework/cli/commands/RunMigrationsCommand.php - ../webfiori/framework/cli/CLITestCase.php - ../webfiori/framework/cli/CLIUtils.php + ../WebFiori/Framework/cli/commands/AddCommand.php + ../WebFiori/Framework/cli/commands/CreateCommand.php + ../WebFiori/Framework/cli/commands/ListRoutesCommand.php + ../WebFiori/Framework/cli/commands/ListThemesCommand.php + ../WebFiori/Framework/cli/commands/RunSQLQueryCommand.php + ../WebFiori/Framework/cli/commands/SchedulerCommand.php + ../WebFiori/Framework/cli/commands/SettingsCommand.php + ../WebFiori/Framework/cli/commands/UpdateSettingsCommand.php + ../WebFiori/Framework/cli/commands/UpdateTableCommand.php + ../WebFiori/Framework/cli/commands/VersionCommand.php + ../WebFiori/Framework/cli/commands/WHelpCommand.php + ../WebFiori/Framework/cli/commands/RunMigrationsCommand.php + ../WebFiori/Framework/cli/CLITestCase.php + ../WebFiori/Framework/cli/CLIUtils.php - ../webfiori/framework/cli/helpers/ClassInfoReader.php - ../webfiori/framework/cli/helpers/CreateBackgroundTask.php - ../webfiori/framework/cli/helpers/CreateCLIClassHelper.php - ../webfiori/framework/cli/helpers/CreateClassHelper.php - ../webfiori/framework/cli/helpers/CreateDBAccessHelper.php - ../webfiori/framework/cli/helpers/CreateFullRESTHelper.php - ../webfiori/framework/cli/helpers/CreateMiddleware.php - ../webfiori/framework/cli/helpers/CreateTableObj.php - ../webfiori/framework/cli/helpers/CreateThemeHelper.php - ../webfiori/framework/cli/helpers/CreateWebService.php - ../webfiori/framework/cli/helpers/TableObjHelper.php - ../webfiori/framework/cli/helpers/CreateAPITestCase.php - ../webfiori/framework/cli/helpers/CreateMigration.php + ../WebFiori/Framework/cli/helpers/ClassInfoReader.php + ../WebFiori/Framework/cli/helpers/CreateBackgroundTask.php + ../WebFiori/Framework/cli/helpers/CreateCLIClassHelper.php + ../WebFiori/Framework/cli/helpers/CreateClassHelper.php + ../WebFiori/Framework/cli/helpers/CreateDBAccessHelper.php + ../WebFiori/Framework/cli/helpers/CreateFullRESTHelper.php + ../WebFiori/Framework/cli/helpers/CreateMiddleware.php + ../WebFiori/Framework/cli/helpers/CreateTableObj.php + ../WebFiori/Framework/cli/helpers/CreateThemeHelper.php + ../WebFiori/Framework/cli/helpers/CreateWebService.php + ../WebFiori/Framework/cli/helpers/TableObjHelper.php + ../WebFiori/Framework/cli/helpers/CreateAPITestCase.php + ../WebFiori/Framework/cli/helpers/CreateMigration.php - ../webfiori/framework/writers/CLICommandClassWriter.php - ../webfiori/framework/writers/ClassWriter.php - ../webfiori/framework/writers/DBClassWriter.php - ../webfiori/framework/writers/LangClassWriter.php - ../webfiori/framework/writers/MiddlewareClassWriter.php - ../webfiori/framework/writers/SchedulerTaskClassWriter.php - ../webfiori/framework/writers/TableClassWriter.php - ../webfiori/framework/writers/ThemeClassWriter.php - ../webfiori/framework/writers/ThemeComponentWriter.php - ../webfiori/framework/writers/WebServiceWriter.php - ../webfiori/framework/writers/APITestCaseWriter.php - ../webfiori/framework/writers/DatabaseMigrationWriter.php + ../WebFiori/Framework/writers/CLICommandClassWriter.php + ../WebFiori/Framework/writers/ClassWriter.php + ../WebFiori/Framework/writers/DBClassWriter.php + ../WebFiori/Framework/writers/LangClassWriter.php + ../WebFiori/Framework/writers/MiddlewareClassWriter.php + ../WebFiori/Framework/writers/SchedulerTaskClassWriter.php + ../WebFiori/Framework/writers/TableClassWriter.php + ../WebFiori/Framework/writers/ThemeClassWriter.php + ../WebFiori/Framework/writers/ThemeComponentWriter.php + ../WebFiori/Framework/writers/WebServiceWriter.php + ../WebFiori/Framework/writers/APITestCaseWriter.php + ../WebFiori/Framework/writers/DatabaseMigrationWriter.php @@ -89,42 +89,42 @@ - ./webfiori/framework/test - ./webfiori/framework/test/langs - ./webfiori/framework/test/router - ./webfiori/framework/test/mail - ./webfiori/framework/test/writers - ./webfiori/framework/test/cli - ./webfiori/framework/test/theme - ./webfiori/framework/test/scheduler - ./webfiori/framework/test/session + ./WebFiori/Framework/Tests + ./WebFiori/Framework/Tests/Langs + ./WebFiori/Framework/Tests/Router + ./WebFiori/Framework/Tests/Mail + ./WebFiori/Framework/Tests/Writers + ./WebFiori/Framework/Tests/Cli + ./WebFiori/Framework/Tests/Theme + ./WebFiori/Framework/Tests/Scheduler + ./WebFiori/Framework/Tests/Session - ./webfiori/framework/test/DBTest.php + ./WebFiori/Framework/Tests/DBTest.php - ./webfiori/framework/test/langs + ./WebFiori/Framework/Tests/Langs - ./webfiori/framework/test/router + ./WebFiori/Framework/Tests/Router - ./webfiori/framework/test/mail + ./WebFiori/Framework/Tests/Mail - ./webfiori/framework/test/writers + ./WebFiori/Framework/Tests/Writers - ./webfiori/framework/test/cli + ./WebFiori/Framework/Tests/Cli - ./webfiori/framework/test/theme + ./WebFiori/Framework/Tests/Theme - ./webfiori/framework/test/scheduler + ./WebFiori/Framework/Tests/Scheduler - ./webfiori/framework/test/session + ./WebFiori/Framework/Tests/Session \ No newline at end of file diff --git a/tests/phpunit10.xml b/tests/phpunit10.xml index b9b55e805..2860fdfcf 100644 --- a/tests/phpunit10.xml +++ b/tests/phpunit10.xml @@ -10,111 +10,111 @@ - ./webfiori/framework/test - ./webfiori/framework/test/theme - ./webfiori/framework/test/cli - ./webfiori/framework/test/langs - ./webfiori/framework/test/router - ./webfiori/framework/test/mail - ./webfiori/framework/test/writers - ./webfiori/framework/test/scheduler - ./webfiori/framework/test/session + ./WebFiori/Framework/Tests + ./WebFiori/Framework/Tests/Theme + ./WebFiori/Framework/Tests/Cli + ./WebFiori/Framework/Tests/Langs + ./WebFiori/Framework/Tests/Router + ./WebFiori/Framework/Tests/Mail + ./WebFiori/Framework/Tests/Writers + ./WebFiori/Framework/Tests/Scheduler + ./WebFiori/Framework/Tests/Session - ./webfiori/framework/test/DBTest.php + ./WebFiori/Framework/Tests/DBTest.php - ./webfiori/framework/test/langs + ./WebFiori/Framework/Tests/Langs - ./webfiori/framework/test/router + ./WebFiori/Framework/Tests/Router - ./webfiori/framework/test/mail + ./WebFiori/Framework/Tests/Mail - ./webfiori/framework/test/writers + ./WebFiori/Framework/Tests/Writers - ./webfiori/framework/test/cli + ./WebFiori/Framework/Tests/Cli - ./webfiori/framework/test/theme + ./WebFiori/Framework/Tests/Theme - ./webfiori/framework/test/scheduler + ./WebFiori/Framework/Tests/Scheduler - ./webfiori/framework/test/session + ./WebFiori/Framework/Tests/Session - ../webfiori/framework/Access.php - ../webfiori/framework/DB.php - ../webfiori/framework/Language.php - ../webfiori/framework/config/JsonDriver.php - ../webfiori/framework/config/ClassDriver.php - ../webfiori/framework/Privilege.php - ../webfiori/framework/PrivilegesGroup.php - ../webfiori/framework/User.php - ../webfiori/framework/Theme.php - ../webfiori/framework/ui/BeforeRenderCallback.php - ../webfiori/framework/ui/WebPage.php - ../webfiori/framework/scheduler/BaseTask.php - ../webfiori/framework/scheduler/AbstractTask.php - ../webfiori/framework/scheduler/TasksManager.php - ../webfiori/framework/scheduler/TaskArgument.php - ../webfiori/framework/router/RouterUri.php - ../webfiori/framework/router/Router.php - ../webfiori/framework/middleware/AbstractMiddleware.php - ../webfiori/framework/middleware/MiddlewareManager.php - ../webfiori/framework/middleware/CacheMiddleware.php - ../webfiori/framework/middleware/StartSessionMiddleware.php - ../webfiori/framework/session/Session.php - ../webfiori/framework/session/SessionsManager.php - ../webfiori/framework/session/DefaultSessionStorage.php - ../webfiori/framework/session/DatabaseSessionStorage.php - ../webfiori/framework/session/SessionDB.php - ../webfiori/framework/cli/commands/AddCommand.php - ../webfiori/framework/cli/commands/CreateCommand.php - ../webfiori/framework/cli/commands/ListRoutesCommand.php - ../webfiori/framework/cli/commands/ListThemesCommand.php - ../webfiori/framework/cli/commands/RunSQLQueryCommand.php - ../webfiori/framework/cli/commands/SchedulerCommand.php - ../webfiori/framework/cli/commands/SettingsCommand.php - ../webfiori/framework/cli/commands/UpdateSettingsCommand.php - ../webfiori/framework/cli/commands/UpdateTableCommand.php - ../webfiori/framework/cli/commands/VersionCommand.php - ../webfiori/framework/cli/commands/WHelpCommand.php - ../webfiori/framework/cli/commands/RunMigrationsCommand.php - ../webfiori/framework/cli/CLITestCase.php - ../webfiori/framework/cli/CLIUtils.php - ../webfiori/framework/cli/helpers/ClassInfoReader.php - ../webfiori/framework/cli/helpers/CreateBackgroundTask.php - ../webfiori/framework/cli/helpers/CreateCLIClassHelper.php - ../webfiori/framework/cli/helpers/CreateClassHelper.php - ../webfiori/framework/cli/helpers/CreateDBAccessHelper.php - ../webfiori/framework/cli/helpers/CreateFullRESTHelper.php - ../webfiori/framework/cli/helpers/CreateMiddleware.php - ../webfiori/framework/cli/helpers/CreateTableObj.php - ../webfiori/framework/cli/helpers/CreateThemeHelper.php - ../webfiori/framework/cli/helpers/CreateWebService.php - ../webfiori/framework/cli/helpers/TableObjHelper.php - ../webfiori/framework/cli/helpers/CreateAPITestCase.php - ../webfiori/framework/cli/helpers/CreateMigration.php - ../webfiori/framework/writers/CLICommandClassWriter.php - ../webfiori/framework/writers/ClassWriter.php - ../webfiori/framework/writers/DBClassWriter.php - ../webfiori/framework/writers/LangClassWriter.php - ../webfiori/framework/writers/MiddlewareClassWriter.php - ../webfiori/framework/writers/SchedulerTaskClassWriter.php - ../webfiori/framework/writers/TableClassWriter.php - ../webfiori/framework/writers/ThemeClassWriter.php - ../webfiori/framework/writers/ThemeComponentWriter.php - ../webfiori/framework/writers/WebServiceWriter.php - ../webfiori/framework/writers/APITestCaseWriter.php - ../webfiori/framework/writers/DatabaseMigrationWriter.php + ../WebFiori/Framework/Access.php + ../WebFiori/Framework/DB.php + ../WebFiori/Framework/Language.php + ../WebFiori/Framework/config/JsonDriver.php + ../WebFiori/Framework/config/ClassDriver.php + ../WebFiori/Framework/Privilege.php + ../WebFiori/Framework/PrivilegesGroup.php + ../WebFiori/Framework/User.php + ../WebFiori/Framework/Theme.php + ../WebFiori/Framework/ui/BeforeRenderCallback.php + ../WebFiori/Framework/ui/WebPage.php + ../WebFiori/Framework/scheduler/BaseTask.php + ../WebFiori/Framework/scheduler/AbstractTask.php + ../WebFiori/Framework/scheduler/TasksManager.php + ../WebFiori/Framework/scheduler/TaskArgument.php + ../WebFiori/Framework/router/RouterUri.php + ../WebFiori/Framework/router/Router.php + ../WebFiori/Framework/middleware/AbstractMiddleware.php + ../WebFiori/Framework/middleware/MiddlewareManager.php + ../WebFiori/Framework/middleware/CacheMiddleware.php + ../WebFiori/Framework/middleware/StartSessionMiddleware.php + ../WebFiori/Framework/session/Session.php + ../WebFiori/Framework/session/SessionsManager.php + ../WebFiori/Framework/session/DefaultSessionStorage.php + ../WebFiori/Framework/session/DatabaseSessionStorage.php + ../WebFiori/Framework/session/SessionDB.php + ../WebFiori/Framework/cli/commands/AddCommand.php + ../WebFiori/Framework/cli/commands/CreateCommand.php + ../WebFiori/Framework/cli/commands/ListRoutesCommand.php + ../WebFiori/Framework/cli/commands/ListThemesCommand.php + ../WebFiori/Framework/cli/commands/RunSQLQueryCommand.php + ../WebFiori/Framework/cli/commands/SchedulerCommand.php + ../WebFiori/Framework/cli/commands/SettingsCommand.php + ../WebFiori/Framework/cli/commands/UpdateSettingsCommand.php + ../WebFiori/Framework/cli/commands/UpdateTableCommand.php + ../WebFiori/Framework/cli/commands/VersionCommand.php + ../WebFiori/Framework/cli/commands/WHelpCommand.php + ../WebFiori/Framework/cli/commands/RunMigrationsCommand.php + ../WebFiori/Framework/cli/CLITestCase.php + ../WebFiori/Framework/cli/CLIUtils.php + ../WebFiori/Framework/cli/helpers/ClassInfoReader.php + ../WebFiori/Framework/cli/helpers/CreateBackgroundTask.php + ../WebFiori/Framework/cli/helpers/CreateCLIClassHelper.php + ../WebFiori/Framework/cli/helpers/CreateClassHelper.php + ../WebFiori/Framework/cli/helpers/CreateDBAccessHelper.php + ../WebFiori/Framework/cli/helpers/CreateFullRESTHelper.php + ../WebFiori/Framework/cli/helpers/CreateMiddleware.php + ../WebFiori/Framework/cli/helpers/CreateTableObj.php + ../WebFiori/Framework/cli/helpers/CreateThemeHelper.php + ../WebFiori/Framework/cli/helpers/CreateWebService.php + ../WebFiori/Framework/cli/helpers/TableObjHelper.php + ../WebFiori/Framework/cli/helpers/CreateAPITestCase.php + ../WebFiori/Framework/cli/helpers/CreateMigration.php + ../WebFiori/Framework/writers/CLICommandClassWriter.php + ../WebFiori/Framework/writers/ClassWriter.php + ../WebFiori/Framework/writers/DBClassWriter.php + ../WebFiori/Framework/writers/LangClassWriter.php + ../WebFiori/Framework/writers/MiddlewareClassWriter.php + ../WebFiori/Framework/writers/SchedulerTaskClassWriter.php + ../WebFiori/Framework/writers/TableClassWriter.php + ../WebFiori/Framework/writers/ThemeClassWriter.php + ../WebFiori/Framework/writers/ThemeComponentWriter.php + ../WebFiori/Framework/writers/WebServiceWriter.php + ../WebFiori/Framework/writers/APITestCaseWriter.php + ../WebFiori/Framework/writers/DatabaseMigrationWriter.php From 91b29d9ae912bbe211272442b58bdf69000f1894 Mon Sep 17 00:00:00 2001 From: Ibrahim BinAlshikh Date: Tue, 7 Oct 2025 23:02:34 +0300 Subject: [PATCH 06/45] Update index.php --- public/index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/index.php b/public/index.php index 8e8db2dcf..88e752ebc 100644 --- a/public/index.php +++ b/public/index.php @@ -13,7 +13,7 @@ * * @since 2.3.0 */ -define('APP_DIR', 'app'); +define('APP_DIR', 'App'); /** From ab65faabf6cdb4b012d61a81dc670c8a9fbb2f16 Mon Sep 17 00:00:00 2001 From: Ibrahim BinAlshikh Date: Tue, 7 Oct 2025 23:06:08 +0300 Subject: [PATCH 07/45] test: Renamed `apis` to `Apis` --- tests/{Apiss => Apis}/EmptyService/EmptyServicesManager.php | 0 tests/{Apiss => Apis}/Multiple/ServicesManager00.php | 0 tests/{Apiss => Apis}/Multiple/WebService00.php | 0 tests/{Apiss => Apis}/Multiple/WebService01.php | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename tests/{Apiss => Apis}/EmptyService/EmptyServicesManager.php (100%) rename tests/{Apiss => Apis}/Multiple/ServicesManager00.php (100%) rename tests/{Apiss => Apis}/Multiple/WebService00.php (100%) rename tests/{Apiss => Apis}/Multiple/WebService01.php (100%) diff --git a/tests/Apiss/EmptyService/EmptyServicesManager.php b/tests/Apis/EmptyService/EmptyServicesManager.php similarity index 100% rename from tests/Apiss/EmptyService/EmptyServicesManager.php rename to tests/Apis/EmptyService/EmptyServicesManager.php diff --git a/tests/Apiss/Multiple/ServicesManager00.php b/tests/Apis/Multiple/ServicesManager00.php similarity index 100% rename from tests/Apiss/Multiple/ServicesManager00.php rename to tests/Apis/Multiple/ServicesManager00.php diff --git a/tests/Apiss/Multiple/WebService00.php b/tests/Apis/Multiple/WebService00.php similarity index 100% rename from tests/Apiss/Multiple/WebService00.php rename to tests/Apis/Multiple/WebService00.php diff --git a/tests/Apiss/Multiple/WebService01.php b/tests/Apis/Multiple/WebService01.php similarity index 100% rename from tests/Apiss/Multiple/WebService01.php rename to tests/Apis/Multiple/WebService01.php From bb2271665778a41162c27faf584b2b481f63c333 Mon Sep 17 00:00:00 2001 From: Ibrahim BinAlshikh Date: Tue, 7 Oct 2025 23:07:11 +0300 Subject: [PATCH 08/45] test: Renamed `tables` to `Tables` --- tests/{Tabless => Tables}/EmployeeInfoTable.php | 0 tests/{Tabless => Tables}/PositionInfoTable.php | 0 tests/{Tabless => Tables}/Schema.php | 0 tests/{Tabless => Tables}/Schema2.php | 0 tests/{Tabless => Tables}/Schema3.php | 0 tests/{Tabless => Tables}/UserInfoTable.php | 0 6 files changed, 0 insertions(+), 0 deletions(-) rename tests/{Tabless => Tables}/EmployeeInfoTable.php (100%) rename tests/{Tabless => Tables}/PositionInfoTable.php (100%) rename tests/{Tabless => Tables}/Schema.php (100%) rename tests/{Tabless => Tables}/Schema2.php (100%) rename tests/{Tabless => Tables}/Schema3.php (100%) rename tests/{Tabless => Tables}/UserInfoTable.php (100%) diff --git a/tests/Tabless/EmployeeInfoTable.php b/tests/Tables/EmployeeInfoTable.php similarity index 100% rename from tests/Tabless/EmployeeInfoTable.php rename to tests/Tables/EmployeeInfoTable.php diff --git a/tests/Tabless/PositionInfoTable.php b/tests/Tables/PositionInfoTable.php similarity index 100% rename from tests/Tabless/PositionInfoTable.php rename to tests/Tables/PositionInfoTable.php diff --git a/tests/Tabless/Schema.php b/tests/Tables/Schema.php similarity index 100% rename from tests/Tabless/Schema.php rename to tests/Tables/Schema.php diff --git a/tests/Tabless/Schema2.php b/tests/Tables/Schema2.php similarity index 100% rename from tests/Tabless/Schema2.php rename to tests/Tables/Schema2.php diff --git a/tests/Tabless/Schema3.php b/tests/Tables/Schema3.php similarity index 100% rename from tests/Tabless/Schema3.php rename to tests/Tables/Schema3.php diff --git a/tests/Tabless/UserInfoTable.php b/tests/Tables/UserInfoTable.php similarity index 100% rename from tests/Tabless/UserInfoTable.php rename to tests/Tables/UserInfoTable.php From e9cb3c6e548d9c3b20591e1e976ad164b9a8d285 Mon Sep 17 00:00:00 2001 From: Ibrahim BinAlshikh Date: Tue, 7 Oct 2025 23:24:59 +0300 Subject: [PATCH 09/45] refactor: Few Fixes --- WebFiori/Framework/App.php | 4 +-- WebFiori/Framework/Autoload/ClassLoader.php | 25 ++++++++--------- WebFiori/Framework/Ini.php | 28 +++++++++---------- tests/WebFiori/Benchmark/RouterBench.php | 2 +- tests/WebFiori/Framework/Tests/PageTest.php | 4 +-- .../Framework/Tests/Theme/ThemeTest.php | 6 ++-- 6 files changed, 34 insertions(+), 35 deletions(-) diff --git a/WebFiori/Framework/App.php b/WebFiori/Framework/App.php index f71d97570..06c92604b 100644 --- a/WebFiori/Framework/App.php +++ b/WebFiori/Framework/App.php @@ -417,7 +417,7 @@ public static function getRunner() : Runner { self::$CliRunner->setBeforeStart(function (Runner $r) { $commands = [ - '\\WebFiori\\Framework\\Cli\commands\\WHelpCommand', + '\\WebFiori\\Framework\\Cli\\Commands\\WHelpCommand', '\\WebFiori\\Framework\\Cli\\Commands\\VersionCommand', '\\WebFiori\\Framework\\Cli\\Commands\\SettingsCommand', '\\WebFiori\\Framework\\Cli\\Commands\\SchedulerCommand', @@ -519,7 +519,7 @@ private function checkAppDir() { * * @since 2.2.1 */ - define('APP_DIR','app'); + define('APP_DIR','App'); } if (strpos(APP_DIR, ' ') !== false || strpos(APP_DIR, '-')) { diff --git a/WebFiori/Framework/Autoload/ClassLoader.php b/WebFiori/Framework/Autoload/ClassLoader.php index 809b09dd3..61add8bea 100644 --- a/WebFiori/Framework/Autoload/ClassLoader.php +++ b/WebFiori/Framework/Autoload/ClassLoader.php @@ -232,23 +232,22 @@ public static function get(array $options = [ if (self::$loader === null) { if (!defined('APP_DIR')) { - define('APP_DIR', 'app'); + define('APP_DIR', 'App'); } $appFolder = APP_DIR; $frameworkSearchFolders = [ '', - $DS.'WebFiori'.$DS.'framework', - $DS.'framework'.$DS.'exceptions', - $DS.'framework'.$DS.'cli', - $DS.'framework'.$DS.'ui', - $DS.'framework', - $DS.'themes', - $DS.'logic', - $DS.'apis', - $DS.'pages', - $DS.'ini', - $DS.'libs', - $DS.'config', + $DS.'WebFiori'.$DS.'Framework', + $DS.'Framework'.$DS.'Exceptions', + $DS.'Framework'.$DS.'Cli', + $DS.'Framework'.$DS.'Ui', + $DS.'Framework', + $DS.'Themes', + $DS.'Apis', + $DS.'Pages', + $DS.'Ini', + $DS.'Libs', + $DS.'Config', $DS.$appFolder ]; diff --git a/WebFiori/Framework/Ini.php b/WebFiori/Framework/Ini.php index 86cf53caf..053c8b96c 100644 --- a/WebFiori/Framework/Ini.php +++ b/WebFiori/Framework/Ini.php @@ -48,15 +48,15 @@ private function __construct() { public static function createAppDirs() { $DS = DIRECTORY_SEPARATOR; self::mkdir(ROOT_PATH.$DS.APP_DIR); - self::mkdir(ROOT_PATH.$DS.APP_DIR.$DS.'ini'); - self::mkdir(ROOT_PATH.$DS.APP_DIR.$DS.'ini'.$DS.'routes'); - self::mkdir(ROOT_PATH.$DS.APP_DIR.$DS.'pages'); - self::mkdir(ROOT_PATH.$DS.APP_DIR.$DS.'commands'); - self::mkdir(ROOT_PATH.$DS.APP_DIR.$DS.'tasks'); - self::mkdir(ROOT_PATH.$DS.APP_DIR.$DS.'middleware'); - self::mkdir(ROOT_PATH.$DS.APP_DIR.$DS.'langs'); - self::mkdir(ROOT_PATH.$DS.APP_DIR.$DS.'apis'); - self::mkdir(ROOT_PATH.$DS.APP_DIR.$DS.'config'); + self::mkdir(ROOT_PATH.$DS.APP_DIR.$DS.'Init'); + self::mkdir(ROOT_PATH.$DS.APP_DIR.$DS.'Init'.$DS.'Routes'); + self::mkdir(ROOT_PATH.$DS.APP_DIR.$DS.'Pages'); + self::mkdir(ROOT_PATH.$DS.APP_DIR.$DS.'Commands'); + self::mkdir(ROOT_PATH.$DS.APP_DIR.$DS.'Tasks'); + self::mkdir(ROOT_PATH.$DS.APP_DIR.$DS.'Middleware'); + self::mkdir(ROOT_PATH.$DS.APP_DIR.$DS.'Langs'); + self::mkdir(ROOT_PATH.$DS.APP_DIR.$DS.'Apis'); + self::mkdir(ROOT_PATH.$DS.APP_DIR.$DS.'Config'); self::mkdir(ROOT_PATH.$DS.APP_DIR.$DS.'sto'); self::mkdir(ROOT_PATH.$DS.APP_DIR.$DS.'sto'.$DS.'uploads'); self::mkdir(ROOT_PATH.$DS.APP_DIR.$DS.'sto'.$DS.'logs'); @@ -79,13 +79,13 @@ public static function createAppDirs() { * @throws FileException */ public function createIniClass(string $className, string $comment) { - $cFile = new File("$className.php", APP_PATH.'ini'); + $cFile = new File("$className.php", APP_PATH.'Init'); $cFile->remove(); $cFile->create(); ClassDriver::a($cFile, [ "create(true); $cFile->write(); - require_once APP_PATH.'ini'.DS."$className.php"; + require_once APP_PATH.'Init'.DS."$className.php"; } /** @@ -117,11 +117,11 @@ public function createIniClass(string $className, string $comment) { * @throws FileException */ public function createRoutesClass(string $className) { - $cFile = new File("$className.php", APP_PATH.'ini'.DS.'routes'); + $cFile = new File("$className.php", APP_PATH.'Init'.DS.'Routes'); $cFile->remove(); ClassDriver::a($cFile, " 'hello', diff --git a/tests/WebFiori/Framework/Tests/PageTest.php b/tests/WebFiori/Framework/Tests/PageTest.php index a946a01af..a67981fd9 100644 --- a/tests/WebFiori/Framework/Tests/PageTest.php +++ b/tests/WebFiori/Framework/Tests/PageTest.php @@ -27,7 +27,7 @@ protected function setUp(): void { $themeNames = array_keys($registeredThemes); if (!in_array('New Theme 2', $themeNames)) { - ThemeManager::register(new \themes\fioriTheme2\NewTestTheme2()); + ThemeManager::register(new \Themes\FioriTheme2\NewTestTheme2()); } if (!in_array('New Super Theme', $themeNames)) { @@ -40,7 +40,7 @@ protected function tearDown(): void { $assetsPath = ROOT_PATH . DS . PUBLIC_FOLDER . DS . 'assets'; if (is_dir($assetsPath)) { // Only remove theme directories, not the entire assets folder - $themeDirs = ['fioriTheme', 'fioriTheme2', 'NewTestTheme2', 'NewFTestTheme']; + $themeDirs = ['FioriTheme', 'FioriTheme2', 'NewTestTheme2', 'NewFTestTheme']; foreach ($themeDirs as $themeDir) { $themePath = $assetsPath . DS . $themeDir; if (is_dir($themePath)) { diff --git a/tests/WebFiori/Framework/Tests/Theme/ThemeTest.php b/tests/WebFiori/Framework/Tests/Theme/ThemeTest.php index e28e26899..cbfd38d84 100644 --- a/tests/WebFiori/Framework/Tests/Theme/ThemeTest.php +++ b/tests/WebFiori/Framework/Tests/Theme/ThemeTest.php @@ -60,7 +60,7 @@ public function testToJson00() { public function testUseTheme00() { $themeName = 'New Theme 2'; ThemeManager::resetRegistered(); - ThemeManager::register(new \themes\fioriTheme2\NewTestTheme2()); + ThemeManager::register(new \Themes\FioriTheme2\NewTestTheme2()); //$this->assertFalse(Theme::isThemeLoaded($themeName)); $theme = ThemeManager::usingTheme($themeName); $this->assertTrue($theme instanceof Theme); @@ -71,9 +71,9 @@ public function testUseTheme00() { $this->assertEquals('https://opensource.org/licenses/MIT',$theme->getLicenseUrl()); $this->assertEquals('MIT',$theme->getLicenseName()); $this->assertEquals(1,count(ThemeManager::getRegisteredThemes())); - $this->assertEquals('fioriTheme2', $theme->getDirectoryName()); + $this->assertEquals('FioriTheme2', $theme->getDirectoryName()); $this->assertEquals('https://my-theme-side.com', $theme->getUrl()); - $this->assertEquals(ROOT_PATH.DS.'themes'.DS.'fioriTheme2'.DS, $theme->getAbsolutePath()); + $this->assertEquals(ROOT_PATH.DS.'themes'.DS.'FioriTheme2'.DS, $theme->getAbsolutePath()); $this->assertEquals('css', $theme->getCssDirName()); $this->assertEquals('js', $theme->getJsDirName()); $this->assertEquals('images', $theme->getImagesDirName()); From 0d489992473fa98ad5d5c0bb4d6cfa20083c8f30 Mon Sep 17 00:00:00 2001 From: Ibrahim BinAlshikh Date: Wed, 8 Oct 2025 01:25:20 +0300 Subject: [PATCH 10/45] refactor: `UI` to `Ui` --- .../Framework/{Ui => UI - Copy}/BeforeRenderCallback.php | 0 WebFiori/Framework/{Ui => UI - Copy}/HTTPCodeView.php | 2 +- WebFiori/Framework/{Ui => UI - Copy}/MessageBox.php | 2 +- .../{Ui => UI - Copy}/ServerErrPage/ServerErrPage.php | 2 +- .../{Ui => UI - Copy}/ServerErrPage/error-details.php | 0 .../{Ui => UI - Copy}/ServerErrPage/server-err-head.php | 0 .../{Ui => UI - Copy}/ServerErrPage/server-err-header.php | 0 .../ServerErrPage/server-err-stack-trace.php | 0 WebFiori/Framework/{Ui => UI - Copy}/StarterPage.php | 2 +- WebFiori/Framework/{Ui => UI - Copy}/WebPage.php | 6 +++--- WebFiori/Framework/{Ui => UI - Copy}/ui-functions.php | 2 +- 11 files changed, 8 insertions(+), 8 deletions(-) rename WebFiori/Framework/{Ui => UI - Copy}/BeforeRenderCallback.php (100%) rename WebFiori/Framework/{Ui => UI - Copy}/HTTPCodeView.php (97%) rename WebFiori/Framework/{Ui => UI - Copy}/MessageBox.php (99%) rename WebFiori/Framework/{Ui => UI - Copy}/ServerErrPage/ServerErrPage.php (98%) rename WebFiori/Framework/{Ui => UI - Copy}/ServerErrPage/error-details.php (100%) rename WebFiori/Framework/{Ui => UI - Copy}/ServerErrPage/server-err-head.php (100%) rename WebFiori/Framework/{Ui => UI - Copy}/ServerErrPage/server-err-header.php (100%) rename WebFiori/Framework/{Ui => UI - Copy}/ServerErrPage/server-err-stack-trace.php (100%) rename WebFiori/Framework/{Ui => UI - Copy}/StarterPage.php (99%) rename WebFiori/Framework/{Ui => UI - Copy}/WebPage.php (99%) rename WebFiori/Framework/{Ui => UI - Copy}/ui-functions.php (99%) diff --git a/WebFiori/Framework/Ui/BeforeRenderCallback.php b/WebFiori/Framework/UI - Copy/BeforeRenderCallback.php similarity index 100% rename from WebFiori/Framework/Ui/BeforeRenderCallback.php rename to WebFiori/Framework/UI - Copy/BeforeRenderCallback.php diff --git a/WebFiori/Framework/Ui/HTTPCodeView.php b/WebFiori/Framework/UI - Copy/HTTPCodeView.php similarity index 97% rename from WebFiori/Framework/Ui/HTTPCodeView.php rename to WebFiori/Framework/UI - Copy/HTTPCodeView.php index 2539d0b71..d114fbb69 100644 --- a/WebFiori/Framework/Ui/HTTPCodeView.php +++ b/WebFiori/Framework/UI - Copy/HTTPCodeView.php @@ -11,7 +11,7 @@ namespace WebFiori\Framework\UI; use WebFiori\Framework\App; -use WebFiori\UI\HTMLNode; +use WebFiori\Ui\HTMLNode; /** * A basic view which is used to display HTTP error codes taken from * language file. diff --git a/WebFiori/Framework/Ui/MessageBox.php b/WebFiori/Framework/UI - Copy/MessageBox.php similarity index 99% rename from WebFiori/Framework/Ui/MessageBox.php rename to WebFiori/Framework/UI - Copy/MessageBox.php index 59db37e49..9f5561792 100644 --- a/WebFiori/Framework/Ui/MessageBox.php +++ b/WebFiori/Framework/UI - Copy/MessageBox.php @@ -10,7 +10,7 @@ */ namespace WebFiori\Framework\UI; -use WebFiori\UI\HTMLNode; +use WebFiori\Ui\HTMLNode; /** * A generic class for showing a floating box in web pages that can have any content * in its body. diff --git a/WebFiori/Framework/Ui/ServerErrPage/ServerErrPage.php b/WebFiori/Framework/UI - Copy/ServerErrPage/ServerErrPage.php similarity index 98% rename from WebFiori/Framework/Ui/ServerErrPage/ServerErrPage.php rename to WebFiori/Framework/UI - Copy/ServerErrPage/ServerErrPage.php index 80851c680..de5b38d88 100644 --- a/WebFiori/Framework/Ui/ServerErrPage/ServerErrPage.php +++ b/WebFiori/Framework/UI - Copy/ServerErrPage/ServerErrPage.php @@ -12,7 +12,7 @@ use WebFiori\Error\AbstractHandler; use WebFiori\Framework\UI\WebPage; -use WebFiori\UI\HTMLNode; +use WebFiori\Ui\HTMLNode; /** * A page which is used to display exception information when it is thrown or * any other errors. diff --git a/WebFiori/Framework/Ui/ServerErrPage/error-details.php b/WebFiori/Framework/UI - Copy/ServerErrPage/error-details.php similarity index 100% rename from WebFiori/Framework/Ui/ServerErrPage/error-details.php rename to WebFiori/Framework/UI - Copy/ServerErrPage/error-details.php diff --git a/WebFiori/Framework/Ui/ServerErrPage/server-err-head.php b/WebFiori/Framework/UI - Copy/ServerErrPage/server-err-head.php similarity index 100% rename from WebFiori/Framework/Ui/ServerErrPage/server-err-head.php rename to WebFiori/Framework/UI - Copy/ServerErrPage/server-err-head.php diff --git a/WebFiori/Framework/Ui/ServerErrPage/server-err-header.php b/WebFiori/Framework/UI - Copy/ServerErrPage/server-err-header.php similarity index 100% rename from WebFiori/Framework/Ui/ServerErrPage/server-err-header.php rename to WebFiori/Framework/UI - Copy/ServerErrPage/server-err-header.php diff --git a/WebFiori/Framework/Ui/ServerErrPage/server-err-stack-trace.php b/WebFiori/Framework/UI - Copy/ServerErrPage/server-err-stack-trace.php similarity index 100% rename from WebFiori/Framework/Ui/ServerErrPage/server-err-stack-trace.php rename to WebFiori/Framework/UI - Copy/ServerErrPage/server-err-stack-trace.php diff --git a/WebFiori/Framework/Ui/StarterPage.php b/WebFiori/Framework/UI - Copy/StarterPage.php similarity index 99% rename from WebFiori/Framework/Ui/StarterPage.php rename to WebFiori/Framework/UI - Copy/StarterPage.php index b0122b379..7c83f6703 100644 --- a/WebFiori/Framework/Ui/StarterPage.php +++ b/WebFiori/Framework/UI - Copy/StarterPage.php @@ -81,7 +81,7 @@ public function __construct() { .'basic instructions on how you may help in supporting the framework in many ways.', $cardsRow->addChild('v-col', ['cols' => 12, 'md' => 6, 'sm' => 12])); } - private function createCard($link, $icon, $cardTitle, $paragraph, \WebFiori\UI\HTMLNode $el) { + private function createCard($link, $icon, $cardTitle, $paragraph, \WebFiori\Ui\HTMLNode $el) { $card = $el->addChild('v-card', [ 'hover', 'height' => '220px', diff --git a/WebFiori/Framework/Ui/WebPage.php b/WebFiori/Framework/UI - Copy/WebPage.php similarity index 99% rename from WebFiori/Framework/Ui/WebPage.php rename to WebFiori/Framework/UI - Copy/WebPage.php index 219ac76fb..f85b4ea5b 100644 --- a/WebFiori/Framework/Ui/WebPage.php +++ b/WebFiori/Framework/UI - Copy/WebPage.php @@ -29,9 +29,9 @@ use WebFiori\Http\Request; use WebFiori\Http\Response; use WebFiori\Json\Json; -use WebFiori\UI\HeadNode; -use WebFiori\UI\HTMLDoc; -use WebFiori\UI\HTMLNode; +use WebFiori\Ui\HeadNode; +use WebFiori\Ui\HTMLDoc; +use WebFiori\Ui\HTMLNode; require_once 'ui-functions.php'; /** * A base class that can be used to implement web pages. diff --git a/WebFiori/Framework/Ui/ui-functions.php b/WebFiori/Framework/UI - Copy/ui-functions.php similarity index 99% rename from WebFiori/Framework/Ui/ui-functions.php rename to WebFiori/Framework/UI - Copy/ui-functions.php index 21fe2b876..e51e50fcf 100644 --- a/WebFiori/Framework/Ui/ui-functions.php +++ b/WebFiori/Framework/UI - Copy/ui-functions.php @@ -14,7 +14,7 @@ use WebFiori\Framework\UI\WebPage; use WebFiori\Http\Response; use WebFiori\Json\JsonI; -use WebFiori\UI\HTMLNode; +use WebFiori\Ui\HTMLNode; /** * This file contains functions that can be used inside PHP templates. The From a45554f103637b1a967b7fae67a9bf5b0988a2c9 Mon Sep 17 00:00:00 2001 From: Ibrahim BinAlshikh Date: Wed, 8 Oct 2025 01:27:01 +0300 Subject: [PATCH 11/45] refactor: `UI` to `Ui` --- Themes/FioriTheme/AsideSection.php | 2 +- Themes/FioriTheme/FooterSection.php | 2 +- Themes/FioriTheme/HeadSection.php | 2 +- Themes/FioriTheme/HeaderSection.php | 2 +- Themes/FioriTheme/NewFTestTheme.php | 4 ++-- Themes/FioriTheme2/AsideSection.php | 2 +- Themes/FioriTheme2/FooterSection.php | 2 +- Themes/FioriTheme2/HeadSection.php | 2 +- Themes/FioriTheme2/HeaderSection.php | 2 +- Themes/FioriTheme2/NewTestTheme2.php | 4 ++-- WebFiori/Framework/App.php | 2 +- WebFiori/Framework/Router/Router.php | 2 +- WebFiori/Framework/Router/RouterUri.php | 2 +- WebFiori/Framework/Scheduler/TaskStatusEmail.php | 4 ++-- WebFiori/Framework/Scheduler/WebUI/BaseTasksPage.php | 4 ++-- WebFiori/Framework/Scheduler/WebUI/TasksTable.php | 4 ++-- WebFiori/Framework/Theme.php | 6 +++--- WebFiori/Framework/Writers/ThemeClassWriter.php | 4 ++-- tests/WebFiori/Framework/Tests/PageTest.php | 2 +- 19 files changed, 27 insertions(+), 27 deletions(-) diff --git a/Themes/FioriTheme/AsideSection.php b/Themes/FioriTheme/AsideSection.php index 5234e22d7..971b953a3 100644 --- a/Themes/FioriTheme/AsideSection.php +++ b/Themes/FioriTheme/AsideSection.php @@ -1,7 +1,7 @@ 'WebFiori\\Collections\\Node', - 'WebFiori/ui' => 'WebFiori\\UI\\HTMLNode', + 'WebFiori/ui' => 'WebFiori\\Ui\\HTMLNode', 'WebFiori/jsonx' => 'WebFiori\\Json\\Json', 'WebFiori/database' => 'WebFiori\\Database\\ResultSet', 'WebFiori/http' => 'WebFiori\\Http\\Response', diff --git a/WebFiori/Framework/Router/Router.php b/WebFiori/Framework/Router/Router.php index cc8cf02d4..36ef763c9 100644 --- a/WebFiori/Framework/Router/Router.php +++ b/WebFiori/Framework/Router/Router.php @@ -24,7 +24,7 @@ use WebFiori\Http\Uri; use WebFiori\Http\WebServicesManager; use WebFiori\Json\Json; -use WebFiori\UI\HTMLNode; +use WebFiori\Ui\HTMLNode; /** * The basic class that is used to route user requests to the correct * location. diff --git a/WebFiori/Framework/Router/RouterUri.php b/WebFiori/Framework/Router/RouterUri.php index ad73058a1..1651116a4 100644 --- a/WebFiori/Framework/Router/RouterUri.php +++ b/WebFiori/Framework/Router/RouterUri.php @@ -14,7 +14,7 @@ use InvalidArgumentException; use WebFiori\Framework\Middleware\MiddlewareManager; use WebFiori\Http\Uri; -use WebFiori\UI\HTMLNode; +use WebFiori\Ui\HTMLNode; /** * A class that is used to split URIs and get their parameters. * diff --git a/WebFiori/Framework/Scheduler/TaskStatusEmail.php b/WebFiori/Framework/Scheduler/TaskStatusEmail.php index 372a19c9f..2f4f42288 100644 --- a/WebFiori/Framework/Scheduler/TaskStatusEmail.php +++ b/WebFiori/Framework/Scheduler/TaskStatusEmail.php @@ -13,8 +13,8 @@ use WebFiori\File\File; use WebFiori\Framework\App; use WebFiori\Framework\EmailMessage; -use WebFiori\UI\HTMLNode; -use WebFiori\UI\TableRow; +use WebFiori\Ui\HTMLNode; +use WebFiori\Ui\TableRow; /** * A class which can be used to send an email regarding the status of * background task execution. diff --git a/WebFiori/Framework/Scheduler/WebUI/BaseTasksPage.php b/WebFiori/Framework/Scheduler/WebUI/BaseTasksPage.php index 08d124846..b27c805ff 100644 --- a/WebFiori/Framework/Scheduler/WebUI/BaseTasksPage.php +++ b/WebFiori/Framework/Scheduler/WebUI/BaseTasksPage.php @@ -13,8 +13,8 @@ use WebFiori\Framework\App; use WebFiori\Framework\UI\WebPage; use WebFiori\Json\Json; -use WebFiori\UI\HTMLNode; -use WebFiori\UI\JsCode; +use WebFiori\Ui\HTMLNode; +use WebFiori\Ui\JsCode; /** * A generic view for scheduler related operations. * diff --git a/WebFiori/Framework/Scheduler/WebUI/TasksTable.php b/WebFiori/Framework/Scheduler/WebUI/TasksTable.php index 81ab58b62..5293d2cf6 100644 --- a/WebFiori/Framework/Scheduler/WebUI/TasksTable.php +++ b/WebFiori/Framework/Scheduler/WebUI/TasksTable.php @@ -10,8 +10,8 @@ */ namespace WebFiori\Framework\Scheduler\WebUI; -use WebFiori\UI\exceptions\InvalidNodeNameException; -use WebFiori\UI\HTMLNode; +use WebFiori\Ui\exceptions\InvalidNodeNameException; +use WebFiori\Ui\HTMLNode; /** * A table which is used to list all scheduled background tasks. diff --git a/WebFiori/Framework/Theme.php b/WebFiori/Framework/Theme.php index 2fa685c0b..38ff1196f 100644 --- a/WebFiori/Framework/Theme.php +++ b/WebFiori/Framework/Theme.php @@ -14,9 +14,9 @@ use WebFiori\Framework\UI\WebPage; use WebFiori\Json\Json; use WebFiori\Json\JsonI; -use WebFiori\UI\exceptions\InvalidNodeNameException; -use WebFiori\UI\HeadNode; -use WebFiori\UI\HTMLNode; +use WebFiori\Ui\exceptions\InvalidNodeNameException; +use WebFiori\Ui\HeadNode; +use WebFiori\Ui\HTMLNode; /** * A base class that is used to construct website UI. * diff --git a/WebFiori/Framework/Writers/ThemeClassWriter.php b/WebFiori/Framework/Writers/ThemeClassWriter.php index 33754993b..1268a0046 100644 --- a/WebFiori/Framework/Writers/ThemeClassWriter.php +++ b/WebFiori/Framework/Writers/ThemeClassWriter.php @@ -12,8 +12,8 @@ use WebFiori\File\File; use WebFiori\Framework\Theme; -use WebFiori\UI\HeadNode; -use WebFiori\UI\HTMLNode; +use WebFiori\Ui\HeadNode; +use WebFiori\Ui\HTMLNode; /** * A class which is used to create basic theme skeleton. diff --git a/tests/WebFiori/Framework/Tests/PageTest.php b/tests/WebFiori/Framework/Tests/PageTest.php index a67981fd9..ee6825077 100644 --- a/tests/WebFiori/Framework/Tests/PageTest.php +++ b/tests/WebFiori/Framework/Tests/PageTest.php @@ -11,7 +11,7 @@ use WebFiori\Framework\ThemeManager; use WebFiori\Framework\UI\WebPage; use WebFiori\Framework\User; -use WebFiori\UI\HTMLNode; +use WebFiori\Ui\HTMLNode; /** * Description of PageTest * From 1a9a8a51b2340542788ec91c2cf80c8c48e3b95e Mon Sep 17 00:00:00 2001 From: Ibrahim BinAlshikh Date: Wed, 8 Oct 2025 01:28:28 +0300 Subject: [PATCH 12/45] Update composer.json --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 9acd5db7b..9fa4d3792 100644 --- a/composer.json +++ b/composer.json @@ -26,11 +26,11 @@ "webfiori/http": "v4.0.*", "webfiori/file": "v2.0.*", "webfiori/jsonx": "v4.0.*", - "webfiori/ui": "v3.0.*", + "webfiori/ui": "v4.0.*", "webfiori/collections": "v2.0.*", "webfiori/database": "v1.1.*", "webfiori/cli": "v2.0.*", - "webfiori/mailer": "v2.0.*", + "webfiori/mailer": "v2.1.*", "webfiori/err": "v2.0.*" }, "scripts": { From 13aba92b69ae525b9455f90b02a1172b1ac94dc8 Mon Sep 17 00:00:00 2001 From: Ibrahim BinAlshikh Date: Wed, 8 Oct 2025 01:37:58 +0300 Subject: [PATCH 13/45] refactor: Namespaces Correction --- App/Init/InitAutoLoad.php | 7 +++--- App/Init/InitCommands.php | 7 +++--- App/Init/InitMiddleware.php | 9 +++---- App/Init/InitPrivileges.php | 7 +++--- App/Init/InitTasks.php | 7 +++--- WebFiori/Framework/App.php | 24 +++++++++---------- .../Framework/Handlers/HTTPErrHandler.php | 2 +- WebFiori/Framework/Router/Router.php | 6 ++--- .../Scheduler/WebUI/BaseTasksPage.php | 2 +- WebFiori/Framework/Theme.php | 2 +- .../BeforeRenderCallback.php | 2 +- .../{UI - Copy => Ui}/HTTPCodeView.php | 2 +- .../{UI - Copy => Ui}/MessageBox.php | 2 +- .../ServerErrPage/ServerErrPage.php | 4 ++-- .../ServerErrPage/error-details.php | 2 +- .../ServerErrPage/server-err-head.php | 2 +- .../ServerErrPage/server-err-header.php | 2 +- .../ServerErrPage/server-err-stack-trace.php | 2 +- .../{UI - Copy => Ui}/StarterPage.php | 2 +- .../Framework/{UI - Copy => Ui}/WebPage.php | 2 +- .../{UI - Copy => Ui}/ui-functions.php | 2 +- WebFiori/Framework/Util.php | 2 +- .../Tests/Cli/ListRoutesCommandTest.php | 2 +- tests/WebFiori/Framework/Tests/PageTest.php | 2 +- 24 files changed, 54 insertions(+), 49 deletions(-) rename WebFiori/Framework/{UI - Copy => Ui}/BeforeRenderCallback.php (99%) rename WebFiori/Framework/{UI - Copy => Ui}/HTTPCodeView.php (97%) rename WebFiori/Framework/{UI - Copy => Ui}/MessageBox.php (99%) rename WebFiori/Framework/{UI - Copy => Ui}/ServerErrPage/ServerErrPage.php (96%) rename WebFiori/Framework/{UI - Copy => Ui}/ServerErrPage/error-details.php (97%) rename WebFiori/Framework/{UI - Copy => Ui}/ServerErrPage/server-err-head.php (95%) rename WebFiori/Framework/{UI - Copy => Ui}/ServerErrPage/server-err-header.php (92%) rename WebFiori/Framework/{UI - Copy => Ui}/ServerErrPage/server-err-stack-trace.php (93%) rename WebFiori/Framework/{UI - Copy => Ui}/StarterPage.php (99%) rename WebFiori/Framework/{UI - Copy => Ui}/WebPage.php (99%) rename WebFiori/Framework/{UI - Copy => Ui}/ui-functions.php (98%) diff --git a/App/Init/InitAutoLoad.php b/App/Init/InitAutoLoad.php index 39995d729..463d2d4c3 100644 --- a/App/Init/InitAutoLoad.php +++ b/App/Init/InitAutoLoad.php @@ -1,12 +1,13 @@ initThemesPath(); - if (!class_exists(APP_DIR.'\ini\InitPrivileges')) { + if (!class_exists(APP_DIR.'\\Init\\InitPrivileges')) { Ini::get()->createIniClass('InitPrivileges', 'Initialize user groups and privileges.'); } //Initialize privileges. //This step must be done before initializing anything. - self::call(APP_DIR.'\ini\InitPrivileges::init'); + self::call(APP_DIR.'\\Init\\InitPrivileges::init'); $this->initMiddleware(); $this->initRoutes(); @@ -384,7 +384,7 @@ public static function initiate(string $appFolder = 'app', string $publicFolder * @throws FileException */ public static function getRunner() : Runner { - if (!class_exists(APP_DIR.'\ini\InitCommands')) { + if (!class_exists(APP_DIR.'\Init\InitCommands')) { Ini::get()->createIniClass('InitCommands', 'A method that can be used to initialize CLI commands.'); } @@ -435,7 +435,7 @@ public static function getRunner() : Runner { $r->register(new $c()); } $r->setDefaultCommand('help'); - self::call(APP_DIR.'\ini\InitCommands::init'); + self::call(APP_DIR.'\Init\InitCommands::init'); }); } @@ -621,11 +621,11 @@ private static function initAutoLoader() { } self::$AU = ClassLoader::get(); - if (!class_exists(APP_DIR.'\ini\InitAutoLoad')) { + if (!class_exists(APP_DIR.'\\Init\\InitAutoLoad')) { Ini::createAppDirs(); Ini::get()->createIniClass('InitAutoLoad', 'Add user-defined directories to the set of directories at which the framework will search for classes.'); } - self::call(APP_DIR.'\ini\InitAutoLoad::init'); + self::call(APP_DIR.'\\Init\\InitAutoLoad::init'); } /** * Initialize global constants which has information about framework version. @@ -671,11 +671,11 @@ private function initMiddleware() { MiddlewareManager::register($inst); }); - if (!class_exists(APP_DIR.'\ini\InitMiddleware')) { + if (!class_exists(APP_DIR.'\Init\InitMiddleware')) { Ini::get()->createIniClass('InitMiddleware', 'Register middleware which are created outside the folder \'[APP_DIR]/middleware\'.'); } MiddlewareManager::register(new StartSessionMiddleware()); - self::call(APP_DIR.'\ini\InitMiddleware::init'); + self::call(APP_DIR.'\Init\InitMiddleware::init'); } /** * @throws FileException @@ -684,10 +684,10 @@ private function initRoutes() { $routesClasses = ['APIsRoutes', 'PagesRoutes', 'ClosureRoutes', 'OtherRoutes']; foreach ($routesClasses as $className) { - if (!class_exists(APP_DIR.'\\ini\\routes\\'.$className)) { + if (!class_exists(APP_DIR.'\\Init\\routes\\'.$className)) { Ini::get()->createRoutesClass($className); } - self::call(APP_DIR.'\ini\routes\\'.$className.'::create'); + self::call(APP_DIR.'\Init\routes\\'.$className.'::create'); } if (Router::routesCount() != 0) { @@ -706,7 +706,7 @@ private function initScheduler() { $uriObj = new RouterUri(Request::getRequestedURI(), ''); $pathArr = $uriObj->getPathArray(); - if (!class_exists(APP_DIR.'\ini\InitTasks')) { + if (!class_exists(APP_DIR.'\Init\InitTasks')) { Ini::get()->createIniClass('InitTasks', 'A method that can be used to register background tasks.'); } @@ -716,7 +716,7 @@ private function initScheduler() { } TasksManager::getPassword(self::getConfig()->getSchedulerPassword()); //initialize scheduler tasks only if in CLI or scheduler is enabled through HTTP. - self::call(APP_DIR.'\ini\InitTasks::init'); + self::call(APP_DIR.'\Init\InitTasks::init'); TasksManager::registerTasks(); } } diff --git a/WebFiori/Framework/Handlers/HTTPErrHandler.php b/WebFiori/Framework/Handlers/HTTPErrHandler.php index 30e0dfbfc..bd8de0c38 100644 --- a/WebFiori/Framework/Handlers/HTTPErrHandler.php +++ b/WebFiori/Framework/Handlers/HTTPErrHandler.php @@ -13,7 +13,7 @@ use WebFiori\Error\AbstractHandler; use WebFiori\Framework\App; use WebFiori\Framework\Router\Router; -use WebFiori\Framework\UI\ServerErrPage\ServerErrPage; +use WebFiori\Framework\Ui\ServerErrPage\ServerErrPage; use WebFiori\Http\Request; use WebFiori\Http\Response; /** diff --git a/WebFiori/Framework/Router/Router.php b/WebFiori/Framework/Router/Router.php index 36ef763c9..e59ac5034 100644 --- a/WebFiori/Framework/Router/Router.php +++ b/WebFiori/Framework/Router/Router.php @@ -16,9 +16,9 @@ use WebFiori\File\exceptions\FileException; use WebFiori\File\File; use WebFiori\Framework\Exceptions\RoutingException; -use WebFiori\Framework\UI\HTTPCodeView; -use WebFiori\Framework\UI\StarterPage; -use WebFiori\Framework\UI\WebPage; +use WebFiori\Framework\Ui\HTTPCodeView; +use WebFiori\Framework\Ui\StarterPage; +use WebFiori\Framework\Ui\WebPage; use WebFiori\Http\Request; use WebFiori\Http\Response; use WebFiori\Http\Uri; diff --git a/WebFiori/Framework/Scheduler/WebUI/BaseTasksPage.php b/WebFiori/Framework/Scheduler/WebUI/BaseTasksPage.php index b27c805ff..543942495 100644 --- a/WebFiori/Framework/Scheduler/WebUI/BaseTasksPage.php +++ b/WebFiori/Framework/Scheduler/WebUI/BaseTasksPage.php @@ -11,7 +11,7 @@ namespace WebFiori\Framework\Scheduler\WebUI; use WebFiori\Framework\App; -use WebFiori\Framework\UI\WebPage; +use WebFiori\Framework\Ui\WebPage; use WebFiori\Json\Json; use WebFiori\Ui\HTMLNode; use WebFiori\Ui\JsCode; diff --git a/WebFiori/Framework/Theme.php b/WebFiori/Framework/Theme.php index 38ff1196f..a5dafc576 100644 --- a/WebFiori/Framework/Theme.php +++ b/WebFiori/Framework/Theme.php @@ -11,7 +11,7 @@ namespace WebFiori\Framework; use ReflectionClass; -use WebFiori\Framework\UI\WebPage; +use WebFiori\Framework\Ui\WebPage; use WebFiori\Json\Json; use WebFiori\Json\JsonI; use WebFiori\Ui\exceptions\InvalidNodeNameException; diff --git a/WebFiori/Framework/UI - Copy/BeforeRenderCallback.php b/WebFiori/Framework/Ui/BeforeRenderCallback.php similarity index 99% rename from WebFiori/Framework/UI - Copy/BeforeRenderCallback.php rename to WebFiori/Framework/Ui/BeforeRenderCallback.php index 106bea5b2..059c34066 100644 --- a/WebFiori/Framework/UI - Copy/BeforeRenderCallback.php +++ b/WebFiori/Framework/Ui/BeforeRenderCallback.php @@ -8,7 +8,7 @@ * https://github.com/WebFiori/.github/blob/main/LICENSE * */ -namespace WebFiori\Framework\UI; +namespace WebFiori\Framework\Ui; use WebFiori\Collections\Comparable; /** diff --git a/WebFiori/Framework/UI - Copy/HTTPCodeView.php b/WebFiori/Framework/Ui/HTTPCodeView.php similarity index 97% rename from WebFiori/Framework/UI - Copy/HTTPCodeView.php rename to WebFiori/Framework/Ui/HTTPCodeView.php index d114fbb69..6c3e8c989 100644 --- a/WebFiori/Framework/UI - Copy/HTTPCodeView.php +++ b/WebFiori/Framework/Ui/HTTPCodeView.php @@ -8,7 +8,7 @@ * https://github.com/WebFiori/.github/blob/main/LICENSE * */ -namespace WebFiori\Framework\UI; +namespace WebFiori\Framework\Ui; use WebFiori\Framework\App; use WebFiori\Ui\HTMLNode; diff --git a/WebFiori/Framework/UI - Copy/MessageBox.php b/WebFiori/Framework/Ui/MessageBox.php similarity index 99% rename from WebFiori/Framework/UI - Copy/MessageBox.php rename to WebFiori/Framework/Ui/MessageBox.php index 9f5561792..6b562711c 100644 --- a/WebFiori/Framework/UI - Copy/MessageBox.php +++ b/WebFiori/Framework/Ui/MessageBox.php @@ -8,7 +8,7 @@ * https://github.com/WebFiori/.github/blob/main/LICENSE * */ -namespace WebFiori\Framework\UI; +namespace WebFiori\Framework\Ui; use WebFiori\Ui\HTMLNode; /** diff --git a/WebFiori/Framework/UI - Copy/ServerErrPage/ServerErrPage.php b/WebFiori/Framework/Ui/ServerErrPage/ServerErrPage.php similarity index 96% rename from WebFiori/Framework/UI - Copy/ServerErrPage/ServerErrPage.php rename to WebFiori/Framework/Ui/ServerErrPage/ServerErrPage.php index de5b38d88..3f4525e25 100644 --- a/WebFiori/Framework/UI - Copy/ServerErrPage/ServerErrPage.php +++ b/WebFiori/Framework/Ui/ServerErrPage/ServerErrPage.php @@ -8,10 +8,10 @@ * https://github.com/WebFiori/.github/blob/main/LICENSE * */ -namespace WebFiori\Framework\UI\ServerErrPage; +namespace WebFiori\Framework\Ui\ServerErrPage; use WebFiori\Error\AbstractHandler; -use WebFiori\Framework\UI\WebPage; +use WebFiori\Framework\Ui\WebPage; use WebFiori\Ui\HTMLNode; /** * A page which is used to display exception information when it is thrown or diff --git a/WebFiori/Framework/UI - Copy/ServerErrPage/error-details.php b/WebFiori/Framework/Ui/ServerErrPage/error-details.php similarity index 97% rename from WebFiori/Framework/UI - Copy/ServerErrPage/error-details.php rename to WebFiori/Framework/Ui/ServerErrPage/error-details.php index bde2da28d..3cd680f8a 100644 --- a/WebFiori/Framework/UI - Copy/ServerErrPage/error-details.php +++ b/WebFiori/Framework/Ui/ServerErrPage/error-details.php @@ -1,5 +1,5 @@ diff --git a/WebFiori/Framework/UI - Copy/ServerErrPage/server-err-header.php b/WebFiori/Framework/Ui/ServerErrPage/server-err-header.php similarity index 92% rename from WebFiori/Framework/UI - Copy/ServerErrPage/server-err-header.php rename to WebFiori/Framework/Ui/ServerErrPage/server-err-header.php index 88fef9d5e..ef7813919 100644 --- a/WebFiori/Framework/UI - Copy/ServerErrPage/server-err-header.php +++ b/WebFiori/Framework/Ui/ServerErrPage/server-err-header.php @@ -1,5 +1,5 @@ diff --git a/WebFiori/Framework/UI - Copy/ServerErrPage/server-err-stack-trace.php b/WebFiori/Framework/Ui/ServerErrPage/server-err-stack-trace.php similarity index 93% rename from WebFiori/Framework/UI - Copy/ServerErrPage/server-err-stack-trace.php rename to WebFiori/Framework/Ui/ServerErrPage/server-err-stack-trace.php index 7b62f964d..2b871f1b8 100644 --- a/WebFiori/Framework/UI - Copy/ServerErrPage/server-err-stack-trace.php +++ b/WebFiori/Framework/Ui/ServerErrPage/server-err-stack-trace.php @@ -1,5 +1,5 @@ Date: Wed, 8 Oct 2025 01:50:25 +0300 Subject: [PATCH 14/45] refactor: Namespaces Correction --- WebFiori/Framework/App.php | 4 ++-- WebFiori/Framework/Scheduler/TasksManager.php | 2 +- WebFiori/Framework/Writers/APITestCaseWriter.php | 2 +- WebFiori/Framework/Writers/CommandClassWriter.php | 4 ++-- WebFiori/Framework/Writers/DatabaseMigrationWriter.php | 2 +- WebFiori/Framework/Writers/MiddlewareClassWriter.php | 2 +- WebFiori/Framework/Writers/SchedulerTaskClassWriter.php | 2 +- WebFiori/Framework/Writers/TableClassWriter.php | 2 +- WebFiori/Framework/Writers/ThemeClassWriter.php | 2 +- WebFiori/Framework/Writers/WebServiceWriter.php | 2 +- .../WebFiori/Framework/Tests/Cli/CreateCLICommandTest.php | 4 ++-- tests/WebFiori/Framework/Tests/Cli/CreateEntityTest.php | 2 +- .../WebFiori/Framework/Tests/Cli/CreateMiddlewareTest.php | 4 ++-- tests/WebFiori/Framework/Tests/Cli/CreateTableTest.php | 6 +++--- tests/WebFiori/Framework/Tests/Cli/CreateTaskTest.php | 8 ++++---- .../WebFiori/Framework/Tests/Cli/CreateWebServiceTest.php | 6 +++--- tests/WebFiori/Framework/Tests/Session/SessionTest.php | 2 +- .../WebFiori/Framework/Tests/Writers/TableWritterTest.php | 6 +++--- tests/bootstrap.php | 2 +- 19 files changed, 32 insertions(+), 32 deletions(-) diff --git a/WebFiori/Framework/App.php b/WebFiori/Framework/App.php index d515be27d..ace32b652 100644 --- a/WebFiori/Framework/App.php +++ b/WebFiori/Framework/App.php @@ -291,7 +291,7 @@ public static function handle() { if (self::$ClassStatus == self::STATUS_NONE) { $publicFolderName = 'public'; - self::initiate('app', $publicFolderName, self::getRoot().DIRECTORY_SEPARATOR.$publicFolderName); + self::initiate('App', $publicFolderName, self::getRoot().DIRECTORY_SEPARATOR.$publicFolderName); } if (self::$ClassStatus == self::STATUS_INITIATED) { self::start(); @@ -321,7 +321,7 @@ public static function handle() { * @param string $indexDir The directory at which index file exist at. * Usually, its the value of the constant __DIR__. */ - public static function initiate(string $appFolder = 'app', string $publicFolder = 'public', string $indexDir = __DIR__) { + public static function initiate(string $appFolder = 'App', string $publicFolder = 'public', string $indexDir = __DIR__) { /** * Change encoding of mb_ functions to UTF-8 */ diff --git a/WebFiori/Framework/Scheduler/TasksManager.php b/WebFiori/Framework/Scheduler/TasksManager.php index 621cac630..cb61da33d 100644 --- a/WebFiori/Framework/Scheduler/TasksManager.php +++ b/WebFiori/Framework/Scheduler/TasksManager.php @@ -586,7 +586,7 @@ public static function monthlyTask(int $dayNumber, string $time, string $name, c */ public static function registerTasks() { if (Runner::isCLI() || (defined('SCHEDULER_THROUGH_HTTP') && SCHEDULER_THROUGH_HTTP === true)) { - App::autoRegister('tasks', function (AbstractTask $task) + App::autoRegister('Tasks', function (AbstractTask $task) { TasksManager::scheduleTask($task); }); diff --git a/WebFiori/Framework/Writers/APITestCaseWriter.php b/WebFiori/Framework/Writers/APITestCaseWriter.php index cdd46eb8f..770b7c2a2 100644 --- a/WebFiori/Framework/Writers/APITestCaseWriter.php +++ b/WebFiori/Framework/Writers/APITestCaseWriter.php @@ -31,7 +31,7 @@ class APITestCaseWriter extends ClassWriter { * will be based on. */ public function __construct(?WebServicesManager $manager = null, null|string|AbstractWebService $service = null) { - parent::__construct('WebService', ROOT_PATH.DS.'tests'.DS.'apis', 'tests\\apis'); + parent::__construct('WebService', ROOT_PATH.DS.'tests'.DS.'Apis', 'tests\\Apis'); $this->setSuffix('Test'); if ($manager !== null) { diff --git a/WebFiori/Framework/Writers/CommandClassWriter.php b/WebFiori/Framework/Writers/CommandClassWriter.php index 0bd7573de..cbbb39649 100644 --- a/WebFiori/Framework/Writers/CommandClassWriter.php +++ b/WebFiori/Framework/Writers/CommandClassWriter.php @@ -41,12 +41,12 @@ class CommandClassWriter extends ClassWriter { * the command will have. */ public function __construct() { - parent::__construct('NewCommand', APP_PATH.'commands', APP_DIR.'\\commands'); + parent::__construct('NewCommand', APP_PATH.'Commands', APP_DIR.'\\Commands'); $this->name = 'new-command'; $this->args = []; $this->desc = ''; $this->setSuffix('Command'); - $this->setNamespace(APP_DIR.'\\commands'); + $this->setNamespace(APP_DIR.'\\Commands'); $this->addUseStatement([ 'WebFiori\\Cli\\Command' ]); diff --git a/WebFiori/Framework/Writers/DatabaseMigrationWriter.php b/WebFiori/Framework/Writers/DatabaseMigrationWriter.php index dba8ead9b..28d833adf 100644 --- a/WebFiori/Framework/Writers/DatabaseMigrationWriter.php +++ b/WebFiori/Framework/Writers/DatabaseMigrationWriter.php @@ -35,7 +35,7 @@ public function __construct(?SchemaRunner $runner) { $this->setClassName($name); - parent::__construct($name, APP_PATH.'database'.DS.'migrations', APP_DIR.'\\database\\migrations'); + parent::__construct($name, APP_PATH.'Database'.DS.'migrations', APP_DIR.'\\Database\\migrations'); $this->addUseStatement([ Database::class, AbstractMigration::class, diff --git a/WebFiori/Framework/Writers/MiddlewareClassWriter.php b/WebFiori/Framework/Writers/MiddlewareClassWriter.php index 4efc9228e..3eb89a583 100644 --- a/WebFiori/Framework/Writers/MiddlewareClassWriter.php +++ b/WebFiori/Framework/Writers/MiddlewareClassWriter.php @@ -47,7 +47,7 @@ class MiddlewareClassWriter extends ClassWriter { * will be added to. */ public function __construct($middlewareName = '', $priority = 0, array $groupsArr = []) { - parent::__construct('NewMiddleware', APP_PATH.'middleware', APP_DIR.'\\middleware'); + parent::__construct('NewMiddleware', APP_PATH.'Middleware', APP_DIR.'\\Middleware'); $this->setSuffix('Middleware'); $this->addUseStatement([ AbstractMiddleware::class, diff --git a/WebFiori/Framework/Writers/SchedulerTaskClassWriter.php b/WebFiori/Framework/Writers/SchedulerTaskClassWriter.php index 928384105..e4438c8b3 100644 --- a/WebFiori/Framework/Writers/SchedulerTaskClassWriter.php +++ b/WebFiori/Framework/Writers/SchedulerTaskClassWriter.php @@ -37,7 +37,7 @@ class SchedulerTaskClassWriter extends ClassWriter { * the task needs. */ public function __construct(string $className = 'NewTask', $taskName = '', $taskDesc = '', array $argsArr = []) { - parent::__construct($className, APP_PATH.'tasks', APP_DIR.'\\tasks'); + parent::__construct($className, APP_PATH.'Tasks', APP_DIR.'\\Tasks'); $this->task = new BaseTask(); if (!$this->setTaskName($taskName)) { diff --git a/WebFiori/Framework/Writers/TableClassWriter.php b/WebFiori/Framework/Writers/TableClassWriter.php index 3a2a52223..13aec8e6b 100644 --- a/WebFiori/Framework/Writers/TableClassWriter.php +++ b/WebFiori/Framework/Writers/TableClassWriter.php @@ -76,7 +76,7 @@ class TableClassWriter extends ClassWriter { * @since 1.0 */ public function __construct(?Table $tableObj = null) { - parent::__construct('NewTable', APP_PATH.'database', APP_DIR.'\\database'); + parent::__construct('NewTable', APP_PATH.'Database', APP_DIR.'\\Database'); $this->setSuffix('Table'); if ($tableObj === null) { diff --git a/WebFiori/Framework/Writers/ThemeClassWriter.php b/WebFiori/Framework/Writers/ThemeClassWriter.php index 1268a0046..959c33bf4 100644 --- a/WebFiori/Framework/Writers/ThemeClassWriter.php +++ b/WebFiori/Framework/Writers/ThemeClassWriter.php @@ -34,7 +34,7 @@ class ThemeClassWriter extends ClassWriter { * */ public function __construct(string $themeName = '') { - parent::__construct('NewTheme', APP_PATH.'themes', APP_DIR.'\\themes\\new'); + parent::__construct('NewTheme', APP_PATH.'Themes', APP_DIR.'\\Themes\\new'); if (!$this->setThemeName($themeName)) { $this->setThemeName('New Theme'); diff --git a/WebFiori/Framework/Writers/WebServiceWriter.php b/WebFiori/Framework/Writers/WebServiceWriter.php index cae3c03b7..ff34e67a5 100644 --- a/WebFiori/Framework/Writers/WebServiceWriter.php +++ b/WebFiori/Framework/Writers/WebServiceWriter.php @@ -47,7 +47,7 @@ class WebServiceWriter extends ClassWriter { * */ public function __construct(?AbstractWebService $webServicesObj = null) { - parent::__construct('NewWebService', APP_PATH.'apis', APP_DIR.'\\apis'); + parent::__construct('NewWebService', APP_PATH.'Apis', APP_DIR.'\\Apis'); $this->setSuffix('Service'); $this->addUseStatement(AbstractWebService::class); diff --git a/tests/WebFiori/Framework/Tests/Cli/CreateCLICommandTest.php b/tests/WebFiori/Framework/Tests/Cli/CreateCLICommandTest.php index 835806d43..142266a87 100644 --- a/tests/WebFiori/Framework/Tests/Cli/CreateCLICommandTest.php +++ b/tests/WebFiori/Framework/Tests/Cli/CreateCLICommandTest.php @@ -46,7 +46,7 @@ public function testCreateCommand00() { "Enter a name for the command:\n", "Give a short description of the command:\n", "Would you like to add arguments to the command?(y/N)\n", - 'Info: New class was created at "'.ROOT_PATH.DS.'app'.DS."commands\".\n", + 'Info: New class was created at "'.ROOT_PATH.DS.'App'.DS."commands\".\n", ], $output); $this->assertTrue(class_exists('\\app\\commands\\NewCLICommand')); $this->removeClass('\\app\\commands\\NewCLICommand'); @@ -105,7 +105,7 @@ public function testCreateCommand01() { "Is this argument optional or not?(Y/n)\n", "Enter default value:\n", "Would you like to add more arguments?(y/N)\n", - 'Info: New class was created at "'.ROOT_PATH.DS.'app'.DS."commands\".\n", + 'Info: New class was created at "'.ROOT_PATH.DS.'App'.DS."commands\".\n", ], $output); $this->assertTrue(class_exists($clazz)); diff --git a/tests/WebFiori/Framework/Tests/Cli/CreateEntityTest.php b/tests/WebFiori/Framework/Tests/Cli/CreateEntityTest.php index 0c155d31c..d03c12545 100644 --- a/tests/WebFiori/Framework/Tests/Cli/CreateEntityTest.php +++ b/tests/WebFiori/Framework/Tests/Cli/CreateEntityTest.php @@ -13,7 +13,7 @@ public function testCreateEntity00() { $output = $this->executeSingleCommand(new CreateCommand(), [ 'WebFiori', 'create', - '--c' => 'entity', + '--c' => 'Entity', '--table' => TestTable::class ], [ 'NeEntity', diff --git a/tests/WebFiori/Framework/Tests/Cli/CreateMiddlewareTest.php b/tests/WebFiori/Framework/Tests/Cli/CreateMiddlewareTest.php index 63c137a04..0e9897320 100644 --- a/tests/WebFiori/Framework/Tests/Cli/CreateMiddlewareTest.php +++ b/tests/WebFiori/Framework/Tests/Cli/CreateMiddlewareTest.php @@ -48,7 +48,7 @@ public function testCreateMiddleware00() { "Enter a name for the middleware:\n", "Enter middleware priority: Enter = '0'\n", "Would you like to add the middleware to a group?(y/N)\n", - 'Info: New class was created at "'.ROOT_PATH.DS.'app'.DS."middleware\".\n", + 'Info: New class was created at "'.ROOT_PATH.DS.'App'.DS."middleware\".\n", ], $output); $this->assertTrue(class_exists('\\App\\Middleware\\NewCoolMdMiddleware')); $this->removeClass('\\App\\Middleware\\NewCoolMdMiddleware'); @@ -84,7 +84,7 @@ public function testCreateMiddleware01() { "Would you like to add the middleware to a group?(y/N)\n", "Enter group name:\n", "Would you like to add the middleware to another group?(y/N)\n", - 'Info: New class was created at "'.ROOT_PATH.DS.'app'.DS."middleware\".\n", + 'Info: New class was created at "'.ROOT_PATH.DS.'App'.DS."middleware\".\n", ], $output); $clazz = '\\App\\Middleware\\NewCoolMiddleware'; diff --git a/tests/WebFiori/Framework/Tests/Cli/CreateTableTest.php b/tests/WebFiori/Framework/Tests/Cli/CreateTableTest.php index 2e2ab4570..45084a699 100644 --- a/tests/WebFiori/Framework/Tests/Cli/CreateTableTest.php +++ b/tests/WebFiori/Framework/Tests/Cli/CreateTableTest.php @@ -120,7 +120,7 @@ public function testCreateTable00() { "Would you like to add another column?(y/N)\n", "Would you like to add foreign keys to the table?(y/N)\n", "Would you like to create an entity class that maps to the database table?(y/N)\n", - 'Info: New class was created at "'.ROOT_PATH.DS.'app'.DS."database\".\n", + 'Info: New class was created at "'.ROOT_PATH.DS.'App'.DS."database\".\n", ]), $output); } @@ -184,7 +184,7 @@ public function testCreateTable01() { "Would you like to add another column?(y/N)\n", "Would you like to add foreign keys to the table?(y/N)\n", "Would you like to create an entity class that maps to the database table?(y/N)\n", - 'Info: New class was created at "'.ROOT_PATH.DS.'app'.DS."database\".\n", + 'Info: New class was created at "'.ROOT_PATH.DS.'App'.DS."database\".\n", ]), $output); } @@ -272,7 +272,7 @@ public function testCreateTable02() { "Would you like to add another column?(y/N)\n", "Would you like to add foreign keys to the table?(y/N)\n", "Would you like to create an entity class that maps to the database table?(y/N)\n", - 'Info: New class was created at "'.ROOT_PATH.DS.'app'.DS."database\".\n", + 'Info: New class was created at "'.ROOT_PATH.DS.'App'.DS."database\".\n", ]), $output); } diff --git a/tests/WebFiori/Framework/Tests/Cli/CreateTaskTest.php b/tests/WebFiori/Framework/Tests/Cli/CreateTaskTest.php index 1c3197e2e..053d463f7 100644 --- a/tests/WebFiori/Framework/Tests/Cli/CreateTaskTest.php +++ b/tests/WebFiori/Framework/Tests/Cli/CreateTaskTest.php @@ -49,7 +49,7 @@ public function test00() { "Enter a name for the task:\n", "Provide short description of what does the task will do:\n", "Would you like to add arguments to the task?(y/N)\n", - "Info: New class was created at \"".ROOT_PATH.DS.'app'.DS."tasks\".\n", + "Info: New class was created at \"".ROOT_PATH.DS.'App'.DS."tasks\".\n", ], $output); $clazz = '\\App\\Tasks\\SuperCoolTask'; $this->assertTrue(class_exists($clazz)); @@ -98,7 +98,7 @@ public function test01() { "Enter a name for the task:\n", "Provide short description of what does the task will do:\n", "Would you like to add arguments to the task?(y/N)\n", - "Info: New class was created at \"".ROOT_PATH.DS.'app'.DS."tasks\".\n", + "Info: New class was created at \"".ROOT_PATH.DS.'App'.DS."tasks\".\n", ], $output); $clazz = '\\App\\Tasks\\SuperCool2Task'; $this->assertTrue(class_exists($clazz)); @@ -152,7 +152,7 @@ public function test02() { "Error: Invalid input is given. Try again.\n", "Provide short description of what does the task will do:\n", "Would you like to add arguments to the task?(y/N)\n", - "Info: New class was created at \"".ROOT_PATH.DS.'app'.DS."tasks\".\n", + "Info: New class was created at \"".ROOT_PATH.DS.'App'.DS."tasks\".\n", ], $output); $clazz = '\\App\\Tasks\\NewRoundTask'; $this->assertTrue(class_exists($clazz)); @@ -208,7 +208,7 @@ public function test03() { "Enter argument name:\n", "Error: Invalid argument name: \n", "Would you like to add more arguments?(y/N)\n", - "Info: New class was created at \"".ROOT_PATH.DS.'app'.DS."tasks\".\n", + "Info: New class was created at \"".ROOT_PATH.DS.'App'.DS."tasks\".\n", ], $output); $clazz = '\\App\\Tasks\\SendDailyReportTask'; $this->assertTrue(class_exists($clazz)); diff --git a/tests/WebFiori/Framework/Tests/Cli/CreateWebServiceTest.php b/tests/WebFiori/Framework/Tests/Cli/CreateWebServiceTest.php index f620ee3e0..7ef11a668 100644 --- a/tests/WebFiori/Framework/Tests/Cli/CreateWebServiceTest.php +++ b/tests/WebFiori/Framework/Tests/Cli/CreateWebServiceTest.php @@ -87,7 +87,7 @@ public function test00() { "Success: New parameter added.\n", "Would you like to add another parameter?(y/N)\n", "Creating the class...\n", - 'Info: New class was created at "'.ROOT_PATH.DS.'app'.DS."apis\".\n", + 'Info: New class was created at "'.ROOT_PATH.DS.'App'.DS."apis\".\n", "Info: Don't forget to add the service to a services manager.\n", ], $output); @@ -186,7 +186,7 @@ public function test01() { "Success: New parameter added.\n", "Would you like to add another parameter?(y/N)\n", "Creating the class...\n", - 'Info: New class was created at "'.ROOT_PATH.DS.'app'.DS."apis\".\n", + 'Info: New class was created at "'.ROOT_PATH.DS.'App'.DS."apis\".\n", "Info: Don't forget to add the service to a services manager.\n", ], $output); @@ -285,7 +285,7 @@ public function test02() { "Success: New parameter added.\n", "Would you like to add another parameter?(y/N)\n", "Creating the class...\n", - 'Info: New class was created at "'.ROOT_PATH.DS.'app'.DS."apis\".\n", + 'Info: New class was created at "'.ROOT_PATH.DS.'App'.DS."apis\".\n", "Info: Don't forget to add the service to a services manager.\n", ], $output); diff --git a/tests/WebFiori/Framework/Tests/Session/SessionTest.php b/tests/WebFiori/Framework/Tests/Session/SessionTest.php index 8db6ba28a..1b6475a40 100644 --- a/tests/WebFiori/Framework/Tests/Session/SessionTest.php +++ b/tests/WebFiori/Framework/Tests/Session/SessionTest.php @@ -26,7 +26,7 @@ protected function setUp(): void { */ public function testClose00($session) { $session->close(); - $filePath = ROOT_PATH.DS.'app'.DS.'sto'.DS.'sessions'.DS.$session->getId(); + $filePath = ROOT_PATH.DS.'App'.DS.'sto'.DS.'sessions'.DS.$session->getId(); $this->assertTrue(File::isFileExist($filePath)); $this->assertFalse($session->isRunning()); $this->assertEquals(0,$session->getStartedAt()); diff --git a/tests/WebFiori/Framework/Tests/Writers/TableWritterTest.php b/tests/WebFiori/Framework/Tests/Writers/TableWritterTest.php index 05e37ec97..1f4d76278 100644 --- a/tests/WebFiori/Framework/Tests/Writers/TableWritterTest.php +++ b/tests/WebFiori/Framework/Tests/Writers/TableWritterTest.php @@ -34,7 +34,7 @@ public function test00() { public function test01() { $writter = new TableClassWriter(); $writter->setClassName('CoolT'); - $writter->setEntityInfo('MyEntity', 'App\\Entity', ROOT_PATH.DS.APP_DIR.DS.'entity', true); + $writter->setEntityInfo('MyEntity', 'App\\Entity', ROOT_PATH.DS.APP_DIR.DS.'Entity', true); $this->assertEquals('CoolTTable', $writter->getName()); $this->assertEquals('App\\Database', $writter->getNamespace()); $this->assertEquals('Table', $writter->getSuffix()); @@ -43,7 +43,7 @@ public function test01() { ], $writter->getUseStatements()); $this->assertEquals('MyEntity', $writter->getEntityName()); $this->assertEquals('App\\Entity', $writter->getEntityNamespace()); - $this->assertEquals(ROOT_PATH.DS.APP_DIR.DS.'entity', $writter->getEntityPath()); + $this->assertEquals(ROOT_PATH.DS.APP_DIR.DS.'Entity', $writter->getEntityPath()); $this->assertTrue($writter->getTable() instanceof MySQLTable); $this->assertFalse($writter->getTable() instanceof MSSQLTable); $writter->writeClass(); @@ -63,7 +63,7 @@ public function test02() { $writter = new TableClassWriter(); $writter->setClassName('CoolT2Table'); $writter->setTableType('mssql'); - $writter->setEntityInfo('MyEntity', 'App\\Entity', ROOT_PATH.DS.APP_DIR.DS.'entity', true); + $writter->setEntityInfo('MyEntity', 'App\\Entity', ROOT_PATH.DS.APP_DIR.DS.'Entity', true); $this->assertEquals('CoolT2Table', $writter->getName()); $this->assertFalse($writter->getTable() instanceof MySQLTable); diff --git a/tests/bootstrap.php b/tests/bootstrap.php index 204332d08..16ef1fe6e 100644 --- a/tests/bootstrap.php +++ b/tests/bootstrap.php @@ -85,7 +85,7 @@ 'tests', 'WebFiori', 'vendor', - 'app', + 'App', 'Themes' ], 'define-root' => true, From 62a721ab331406054bb47b4a70116ce611e95138 Mon Sep 17 00:00:00 2001 From: Ibrahim BinAlshikh Date: Wed, 8 Oct 2025 02:00:09 +0300 Subject: [PATCH 15/45] test: Namespaces Correction --- tests/TestEntities/UserContactInfo.php | 2 +- .../Framework/Tests/Cli/CreateMiddlewareTest.php | 2 +- .../Framework/Tests/Cli/CreateMigrationTest.php | 4 ++-- .../Framework/Tests/Cli/CreateThemeTest.php | 14 +++++++------- tests/WebFiori/Framework/Tests/DBTest.php | 4 ++-- tests/WebFiori/Framework/Tests/PageTest.php | 2 +- .../WebFiori/Framework/Tests/Router/RouterTest.php | 4 ++-- tests/WebFiori/Framework/Tests/Theme/ThemeTest.php | 2 +- .../Tests/Writers/CLICommandClassWriterTest.php | 6 +++--- .../Tests/Writers/DatabaseMigrationWriterTest.php | 10 +++++----- .../Framework/Tests/Writers/ThemeWritterTest.php | 8 ++++---- .../Tests/Writers/WebServiceTestCaseWriterTest.php | 6 +++--- 12 files changed, 32 insertions(+), 32 deletions(-) diff --git a/tests/TestEntities/UserContactInfo.php b/tests/TestEntities/UserContactInfo.php index 2760b2877..8d46b1436 100644 --- a/tests/TestEntities/UserContactInfo.php +++ b/tests/TestEntities/UserContactInfo.php @@ -29,7 +29,7 @@ public function __construct() { $this->getCol('contact-type')->setIsUnique(false); $this->getCol('contact-type')->setIsPrimary(true); $this->table->addColumn('contact-info', new MySQLColumn('contact_info', 'varchar',320)); - $this->table->addReference('WebFiori\tests\database\UsersQuery', [ + $this->table->addReference('WebFiori\Tests\Database\UsersQuery', [ 'user-id' => 'user-id' ], 'user_contact_info_fk', 'cadcade', 'cascade'); $this->setTable($this->table); diff --git a/tests/WebFiori/Framework/Tests/Cli/CreateMiddlewareTest.php b/tests/WebFiori/Framework/Tests/Cli/CreateMiddlewareTest.php index 0e9897320..3bec6c1e8 100644 --- a/tests/WebFiori/Framework/Tests/Cli/CreateMiddlewareTest.php +++ b/tests/WebFiori/Framework/Tests/Cli/CreateMiddlewareTest.php @@ -61,7 +61,7 @@ public function testCreateMiddleware01() { $output = $this->executeSingleCommand(new CreateCommand(), [ 'WebFiori', 'create', - '--c' => 'middleware' + '--c' => 'Middleware' ], [ 'NewCool', 'App\Middleware', diff --git a/tests/WebFiori/Framework/Tests/Cli/CreateMigrationTest.php b/tests/WebFiori/Framework/Tests/Cli/CreateMigrationTest.php index 841fa27ca..55c08f262 100644 --- a/tests/WebFiori/Framework/Tests/Cli/CreateMigrationTest.php +++ b/tests/WebFiori/Framework/Tests/Cli/CreateMigrationTest.php @@ -11,7 +11,7 @@ class CreateMigrationTest extends CLITestCase { protected function tearDown(): void { // Clean up only specific migration files created by this test - $migrationsDir = APP_PATH . DS . 'database' . DS . 'migrations'; + $migrationsDir = APP_PATH . DS . 'Database' . DS . 'migrations'; if (is_dir($migrationsDir)) { // Only remove Migration files directly in the migrations directory $files = glob($migrationsDir . DS . 'Migration[0-9][0-9][0-9].php'); @@ -41,7 +41,7 @@ public function testCreateMigration01() { $this->assertEquals([ "Migration namespace: Enter = 'app\database\migrations'\n", "Provide a name for the class that will have migration logic:\n", - 'Info: New class was created at "'. APP_PATH .'database'.DS.'migrations".'."\n", + 'Info: New class was created at "'. APP_PATH .'Database'.DS.'migrations".'."\n", ], $this->executeMultiCommand([ CreateCommand::class, '--c' => 'migration', diff --git a/tests/WebFiori/Framework/Tests/Cli/CreateThemeTest.php b/tests/WebFiori/Framework/Tests/Cli/CreateThemeTest.php index c3e66729a..27f24f21a 100644 --- a/tests/WebFiori/Framework/Tests/Cli/CreateThemeTest.php +++ b/tests/WebFiori/Framework/Tests/Cli/CreateThemeTest.php @@ -41,9 +41,9 @@ public function testCreateTheme00() { "10: Database migration.\n", "11: Quit. <--\n", "Enter a name for the new class:\n", - "Enter an optional namespace for the class: Enter = 'themes'\n", - 'Creating theme at "'.ROOT_PATH.DS.'themes'.DS."fiori\"...\n", - 'Info: New class was created at "'.ROOT_PATH.DS.'themes'.DS."fiori\".\n", + "Enter an optional namespace for the class: Enter = 'Themes'\n", + 'Creating theme at "'.ROOT_PATH.DS.'Themes'.DS."fiori\"...\n", + 'Info: New class was created at "'.ROOT_PATH.DS.'Themes'.DS."fiori\".\n", ], $output); $this->assertTrue(class_exists('\\themes\\fiori\\NewTestTheme')); @@ -94,12 +94,12 @@ public function testCreateThemeWithExistingName() { "10: Database migration.\n", "11: Quit. <--\n", "Enter a name for the new class:\n", - "Enter an optional namespace for the class: Enter = 'themes'\n", + "Enter an optional namespace for the class: Enter = 'Themes'\n", "Error: A class in the given namespace which has the given name was found.\n", "Enter a name for the new class:\n", - "Enter an optional namespace for the class: Enter = 'themes'\n", - 'Creating theme at "'.ROOT_PATH.DS.'themes'.DS."cool\"...\n", - 'Info: New class was created at "'.ROOT_PATH.DS.'themes'.DS."cool\".\n", + "Enter an optional namespace for the class: Enter = 'Themes'\n", + 'Creating theme at "'.ROOT_PATH.DS.'Themes'.DS."cool\"...\n", + 'Info: New class was created at "'.ROOT_PATH.DS.'Themes'.DS."cool\".\n", ], $output); $this->assertEquals(0, $this->getExitCode()); $this->removeClass($ns2.'\\'.$name2); diff --git a/tests/WebFiori/Framework/Tests/DBTest.php b/tests/WebFiori/Framework/Tests/DBTest.php index 21bb34ac7..57dd6de40 100644 --- a/tests/WebFiori/Framework/Tests/DBTest.php +++ b/tests/WebFiori/Framework/Tests/DBTest.php @@ -52,7 +52,7 @@ public function test03() { $conn = new ConnectionInfo('mysql', 'root', '123456', 'testing_db'); $db = new DB($conn); $this->assertEquals(0, count($db->getTables())); - $db->register('database'); + $db->register('Database'); $this->assertEquals(2, count($db->getTables())); } /** @@ -64,7 +64,7 @@ public function test04() { App::getConfig()->addOrUpdateDBConnection($conn); $db = new DB('default-conn'); $this->assertEquals(0, count($db->getTables())); - $db->register('database'); + $db->register('Database'); $this->assertEquals(2, count($db->getTables())); App::getConfig()->removeAllDBConnections(); } diff --git a/tests/WebFiori/Framework/Tests/PageTest.php b/tests/WebFiori/Framework/Tests/PageTest.php index 9b31c533f..493767024 100644 --- a/tests/WebFiori/Framework/Tests/PageTest.php +++ b/tests/WebFiori/Framework/Tests/PageTest.php @@ -31,7 +31,7 @@ protected function setUp(): void { } if (!in_array('New Super Theme', $themeNames)) { - ThemeManager::register(new \themes\fioriTheme\NewFTestTheme()); + ThemeManager::register(new \Themes\FioriTheme\NewFTestTheme()); } } diff --git a/tests/WebFiori/Framework/Tests/Router/RouterTest.php b/tests/WebFiori/Framework/Tests/Router/RouterTest.php index 5cf2f0117..d63919f1f 100644 --- a/tests/WebFiori/Framework/Tests/Router/RouterTest.php +++ b/tests/WebFiori/Framework/Tests/Router/RouterTest.php @@ -500,7 +500,7 @@ public function testClassRoute00() { Response::clear(); Router::addRoute([ RouteOption::PATH => 'home', - RouteOption::TO => \app\apis\RoutingTestClass::class + RouteOption::TO => \App\Apis\RoutingTestClass::class ]); Router::route('https://127.0.0.1/home'); @@ -514,7 +514,7 @@ public function testClassRoute02() { Router::removeAll(); Router::addRoute([ RouteOption::PATH => 'home', - RouteOption::TO => \app\apis\RoutingTestClass::class, + RouteOption::TO => \App\Apis\RoutingTestClass::class, RouteOption::ACTION => 'doSomething' ]); Router::route('https://127.0.0.1/home'); diff --git a/tests/WebFiori/Framework/Tests/Theme/ThemeTest.php b/tests/WebFiori/Framework/Tests/Theme/ThemeTest.php index cbfd38d84..4783a7338 100644 --- a/tests/WebFiori/Framework/Tests/Theme/ThemeTest.php +++ b/tests/WebFiori/Framework/Tests/Theme/ThemeTest.php @@ -73,7 +73,7 @@ public function testUseTheme00() { $this->assertEquals(1,count(ThemeManager::getRegisteredThemes())); $this->assertEquals('FioriTheme2', $theme->getDirectoryName()); $this->assertEquals('https://my-theme-side.com', $theme->getUrl()); - $this->assertEquals(ROOT_PATH.DS.'themes'.DS.'FioriTheme2'.DS, $theme->getAbsolutePath()); + $this->assertEquals(ROOT_PATH.DS.'Themes'.DS.'FioriTheme2'.DS, $theme->getAbsolutePath()); $this->assertEquals('css', $theme->getCssDirName()); $this->assertEquals('js', $theme->getJsDirName()); $this->assertEquals('images', $theme->getImagesDirName()); diff --git a/tests/WebFiori/Framework/Tests/Writers/CLICommandClassWriterTest.php b/tests/WebFiori/Framework/Tests/Writers/CLICommandClassWriterTest.php index 3541f1c1c..165df1b7d 100644 --- a/tests/WebFiori/Framework/Tests/Writers/CLICommandClassWriterTest.php +++ b/tests/WebFiori/Framework/Tests/Writers/CLICommandClassWriterTest.php @@ -12,7 +12,7 @@ class CLICommandClassWriterTest extends TestCase { public function test00() { $writer = new CommandClassWriter(); $this->assertEquals('NewCommand', $writer->getName()); - $this->assertEquals(ROOT_PATH.DS.APP_DIR.DS.'commands'.DS.'NewCommand.php', $writer->getAbsolutePath()); + $this->assertEquals(ROOT_PATH.DS.APP_DIR.DS.'Commands'.DS.'NewCommand.php', $writer->getAbsolutePath()); $this->assertEquals('app\\commands', $writer->getNamespace()); $this->assertEquals('new-command', $writer->getCommandName()); $this->assertEquals('', $writer->getDescription()); @@ -37,7 +37,7 @@ public function test01() { $this->assertFalse($writer->setClassName(' ')); $this->assertTrue($writer->setClassName('DoItXCommand')); $this->assertEquals('DoItXCommand', $writer->getName()); - $this->assertEquals(ROOT_PATH.DS.APP_DIR.DS.'commands'.DS.'DoItXCommand.php', $writer->getAbsolutePath()); + $this->assertEquals(ROOT_PATH.DS.APP_DIR.DS.'Commands'.DS.'DoItXCommand.php', $writer->getAbsolutePath()); $this->assertEquals('app\\commands', $writer->getNamespace()); $this->assertEquals('Lets-Do-It', $writer->getCommandName()); $this->assertEquals('', $writer->getDescription()); @@ -80,7 +80,7 @@ public function test02() { $this->assertFalse($writer->setClassName(' ')); $this->assertTrue($writer->setClassName('DoItX2Command')); $this->assertEquals('DoItX2Command', $writer->getName()); - $this->assertEquals(ROOT_PATH.DS.APP_DIR.DS.'commands'.DS.'DoItX2Command.php', $writer->getAbsolutePath()); + $this->assertEquals(ROOT_PATH.DS.APP_DIR.DS.'Commands'.DS.'DoItX2Command.php', $writer->getAbsolutePath()); $this->assertEquals('app\\commands', $writer->getNamespace()); $this->assertEquals('Lets-Do-It', $writer->getCommandName()); $this->assertEquals('', $writer->getDescription()); diff --git a/tests/WebFiori/Framework/Tests/Writers/DatabaseMigrationWriterTest.php b/tests/WebFiori/Framework/Tests/Writers/DatabaseMigrationWriterTest.php index ba87f4786..82ea557b5 100644 --- a/tests/WebFiori/Framework/Tests/Writers/DatabaseMigrationWriterTest.php +++ b/tests/WebFiori/Framework/Tests/Writers/DatabaseMigrationWriterTest.php @@ -14,7 +14,7 @@ class DatabaseMigrationWriterTest extends TestCase { protected function tearDown(): void { // Clean up only the Migration files created by this test (Migration000, Migration001, etc.) - $migrationsDir = APP_PATH . DS . 'database' . DS . 'migrations'; + $migrationsDir = APP_PATH . DS . 'Database' . DS . 'migrations'; if (is_dir($migrationsDir)) { // Only remove Migration files directly in the migrations directory, not in subdirectories $files = glob($migrationsDir . DS . 'Migration[0-9][0-9][0-9].php'); @@ -31,7 +31,7 @@ protected function tearDown(): void { */ public function test00() { DatabaseMigrationWriter::resetCounter(); - $path = APP_PATH.DS.'database'.DS.'migrations'; + $path = APP_PATH.DS.'Database'.DS.'migrations'; $ns = '\\App\\Database\\migrations'; $clazz = "\\App\\Database\\migrations\\Migration000"; $this->removeClass($clazz); @@ -63,7 +63,7 @@ public function test00() { public function test01() { DatabaseMigrationWriter::resetCounter(); $runner = new SchemaRunner(null); - $path = APP_PATH.DS.'database'.DS.'migrations'; + $path = APP_PATH.DS.'Database'.DS.'migrations'; $ns = '\\App\\Database\\migrations'; $writter = new DatabaseMigrationWriter($runner); $writter->setClassName('MyMigration'); @@ -89,7 +89,7 @@ public function test01() { public function test02() { DatabaseMigrationWriter::resetCounter(); $runner = new SchemaRunner(null); - $path = APP_PATH.DS.'database'.DS.'migrations'; + $path = APP_PATH.DS.'Database'.DS.'migrations'; $ns = '\\App\\Database\\migrations'; $writter = new DatabaseMigrationWriter($runner); $this->assertEquals('Migration000', $writter->getName()); @@ -131,7 +131,7 @@ public function test02() { public function test03() { DatabaseMigrationWriter::resetCounter(); $runner = new SchemaRunner(null); - $path = APP_PATH.DS.'database'.DS.'migrations'; + $path = APP_PATH.DS.'Database'.DS.'migrations'; $ns = '\\App\\Database\\migrations'; $allClasses = []; for ($x = 0 ; $x < 110 ; $x++) { diff --git a/tests/WebFiori/Framework/Tests/Writers/ThemeWritterTest.php b/tests/WebFiori/Framework/Tests/Writers/ThemeWritterTest.php index 5d695bb68..596c220a6 100644 --- a/tests/WebFiori/Framework/Tests/Writers/ThemeWritterTest.php +++ b/tests/WebFiori/Framework/Tests/Writers/ThemeWritterTest.php @@ -15,7 +15,7 @@ class ThemeWritterTest extends TestCase { public function test00() { $writter = new ThemeClassWriter(); $this->assertEquals('NewTheme', $writter->getName()); - $this->assertEquals('app\\themes\\new', $writter->getNamespace()); + $this->assertEquals('App\\Themes\\new', $writter->getNamespace()); $this->assertEquals('Theme', $writter->getSuffix()); $this->assertEquals([ ], $writter->getUseStatements()); @@ -29,9 +29,9 @@ public function test01() { $writter->setClassName('SuperHotNew'); $writter->setThemeName('Cool Theme'); $this->assertEquals('SuperHotNewTheme', $writter->getName()); - $writter->setNamespace('app\\themes\\cool'); - $writter->setPath(ROOT_PATH.DS.APP_DIR.DS.'themes'.DS.'cool'); - $this->assertEquals('app\\themes\\cool', $writter->getNamespace()); + $writter->setNamespace('App\\Themes\\cool'); + $writter->setPath(ROOT_PATH.DS.APP_DIR.DS.'Themes'.DS.'cool'); + $this->assertEquals('App\\Themes\\cool', $writter->getNamespace()); $this->assertEquals('Theme', $writter->getSuffix()); $this->assertEquals([ ], $writter->getUseStatements()); diff --git a/tests/WebFiori/Framework/Tests/Writers/WebServiceTestCaseWriterTest.php b/tests/WebFiori/Framework/Tests/Writers/WebServiceTestCaseWriterTest.php index 1666a0f88..30df30828 100644 --- a/tests/WebFiori/Framework/Tests/Writers/WebServiceTestCaseWriterTest.php +++ b/tests/WebFiori/Framework/Tests/Writers/WebServiceTestCaseWriterTest.php @@ -17,7 +17,7 @@ public function test00() { $w = new APITestCaseWriter(new TasksServicesManager(), ForceTaskExecutionService::class); $this->assertEquals('tests\\apis\\WebServiceTest', $w->getName(true)); $this->assertEquals(9, $w->getPhpUnitVersion()); - $this->assertEquals(ROOT_PATH.DS.'tests'.DS.'apis'.DS.'WebServiceTest.php', $w->getAbsolutePath()); + $this->assertEquals(ROOT_PATH.DS.'Tests'.DS.'Apis'.DS.'WebServiceTest.php', $w->getAbsolutePath()); $w->writeClass(); $this->assertTrue(class_exists('\\'.$w->getName(true))); unlink($w->getAbsolutePath()); @@ -29,10 +29,10 @@ public function test01() { $w = new APITestCaseWriter(new TasksServicesManager(), new ForceTaskExecutionService()); $w->setClassName('Cool'); $w->setNamespace('\\tests\\cool'); - $w->setPath(ROOT_PATH.DS.'tests'.DS.'cool'); + $w->setPath(ROOT_PATH.DS.'Tests'.DS.'cool'); $this->assertEquals('tests\\cool\\CoolTest', $w->getName(true)); $w->writeClass(); - $this->assertEquals(ROOT_PATH.DS.'tests'.DS.'cool'.DS.'CoolTest.php', $w->getAbsolutePath()); + $this->assertEquals(ROOT_PATH.DS.'Tests'.DS.'cool'.DS.'CoolTest.php', $w->getAbsolutePath()); $this->assertTrue(file_exists($w->getAbsolutePath())); require_once $w->getAbsolutePath(); $this->assertTrue(class_exists('\\'.$w->getName(true))); From 43177486a78dc7686d5e42cba75bfd3520fd304d Mon Sep 17 00:00:00 2001 From: Ibrahim BinAlshikh Date: Wed, 8 Oct 2025 14:28:09 +0300 Subject: [PATCH 16/45] Delete .gitkeep --- Themes/fiori/.gitkeep | 1 - 1 file changed, 1 deletion(-) delete mode 100644 Themes/fiori/.gitkeep diff --git a/Themes/fiori/.gitkeep b/Themes/fiori/.gitkeep deleted file mode 100644 index 8b1378917..000000000 --- a/Themes/fiori/.gitkeep +++ /dev/null @@ -1 +0,0 @@ - From 60179cd16890edadb5e08fc136f35a9896de4eda Mon Sep 17 00:00:00 2001 From: Ibrahim BinAlshikh Date: Wed, 8 Oct 2025 14:29:00 +0300 Subject: [PATCH 17/45] Create .gitkeep --- Themes/Fiori/.gitkeep | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Themes/Fiori/.gitkeep diff --git a/Themes/Fiori/.gitkeep b/Themes/Fiori/.gitkeep new file mode 100644 index 000000000..e69de29bb From 35d7b3848ac8481f67eafbfa7307d0dc8945b0b7 Mon Sep 17 00:00:00 2001 From: Ibrahim BinAlshikh Date: Wed, 8 Oct 2025 14:33:37 +0300 Subject: [PATCH 18/45] refactor: Namespaces Correction --- WebFiori/Framework/Cli/Helpers/CreateBackgroundTask.php | 2 +- WebFiori/Framework/Cli/Helpers/CreateCLIClassHelper.php | 2 +- WebFiori/Framework/Cli/Helpers/CreateDBAccessHelper.php | 4 ++-- WebFiori/Framework/Cli/Helpers/CreateFullRESTHelper.php | 6 +++--- WebFiori/Framework/Cli/Helpers/CreateMiddleware.php | 2 +- WebFiori/Framework/Cli/Helpers/CreateMigration.php | 2 +- WebFiori/Framework/Cli/Helpers/CreateTableObj.php | 2 +- WebFiori/Framework/Cli/Helpers/CreateWebService.php | 2 +- WebFiori/Framework/Writers/LangClassWriter.php | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/WebFiori/Framework/Cli/Helpers/CreateBackgroundTask.php b/WebFiori/Framework/Cli/Helpers/CreateBackgroundTask.php index 5eeda1add..26d6b1cc3 100644 --- a/WebFiori/Framework/Cli/Helpers/CreateBackgroundTask.php +++ b/WebFiori/Framework/Cli/Helpers/CreateBackgroundTask.php @@ -38,7 +38,7 @@ public function __construct(CreateCommand $command) { $this->taskWriter = $this->getWriter(); } public function readClassInfo() { - $this->setClassInfo(APP_DIR.'\\tasks', 'Task'); + $this->setClassInfo(APP_DIR.'\\Tasks', 'Task'); $taskName = $this->getTaskName(); $taskDesc = $this->getTaskDesc(); diff --git a/WebFiori/Framework/Cli/Helpers/CreateCLIClassHelper.php b/WebFiori/Framework/Cli/Helpers/CreateCLIClassHelper.php index 688803a01..7b05ff331 100644 --- a/WebFiori/Framework/Cli/Helpers/CreateCLIClassHelper.php +++ b/WebFiori/Framework/Cli/Helpers/CreateCLIClassHelper.php @@ -35,7 +35,7 @@ public function __construct(CreateCommand $command) { $this->cliWriter = $this->getWriter(); } public function readClassInfo() { - $this->setClassInfo(APP_DIR.'\\commands', 'Command'); + $this->setClassInfo(APP_DIR.'\\Commands', 'Command'); $commandName = $this->getCommandName(); $commandDesc = $this->getInput('Give a short description of the command:'); diff --git a/WebFiori/Framework/Cli/Helpers/CreateDBAccessHelper.php b/WebFiori/Framework/Cli/Helpers/CreateDBAccessHelper.php index 963805677..a7b592991 100644 --- a/WebFiori/Framework/Cli/Helpers/CreateDBAccessHelper.php +++ b/WebFiori/Framework/Cli/Helpers/CreateDBAccessHelper.php @@ -51,7 +51,7 @@ public function getTable() : Table { * the namespace at which the class will be added to. */ public function readDbClassInfo() { - $info = $this->getClassInfo(APP_DIR.'\\database', 'DB'); + $info = $this->getClassInfo(APP_DIR.'\\Database', 'DB'); $this->getWriter()->setNamespace($info['namespace']); $this->getWriter()->setPath(ROOT_PATH.DS.$info['namespace']); $this->getWriter()->setClassName($info['name']); @@ -62,7 +62,7 @@ public function readEntityInfo() { $t = $this->getTable(); $m = $t->getEntityMapper(); $m->setEntityName($this->getCommand()->readClassName('Entity class name:', null)); - $m->setNamespace($this->getCommand()->readNamespace('Entity namespace:', APP_DIR.'\\entity')); + $m->setNamespace($this->getCommand()->readNamespace('Entity namespace:', APP_DIR.'\\Entity')); } public function readTable() { $tableClassNameValidity = false; diff --git a/WebFiori/Framework/Cli/Helpers/CreateFullRESTHelper.php b/WebFiori/Framework/Cli/Helpers/CreateFullRESTHelper.php index 7f67c056e..a15324ece 100644 --- a/WebFiori/Framework/Cli/Helpers/CreateFullRESTHelper.php +++ b/WebFiori/Framework/Cli/Helpers/CreateFullRESTHelper.php @@ -207,11 +207,11 @@ private function IncludeAPISetProps(WebServiceWriter $w, $type) { } private function readAPIInfo() { - $this->apisNs = CLIUtils::readNamespace($this->getCommand(), APP_DIR.'\\apis',"Last thing needed is to provide us with namespace for web services:"); + $this->apisNs = CLIUtils::readNamespace($this->getCommand(), APP_DIR.'\\Apis',"Last thing needed is to provide us with namespace for web services:"); } private function readEntityInfo() { $this->println("First thing, we need entity class information."); - $entityInfo = $this->getClassInfo(APP_DIR.'\\entity'); + $entityInfo = $this->getClassInfo(APP_DIR.'\\Entity'); $entityInfo['implement-jsoni'] = $this->confirm('Would you like from your entity class to implement the interface JsonI?', true); $this->tableObjWriter->setEntityInfo($entityInfo['name'], $entityInfo['namespace'], $entityInfo['path'], $entityInfo['implement-jsoni']); @@ -230,7 +230,7 @@ private function readEntityInfo() { } private function readTableInfo() { $this->println("Now, time to collect database table information."); - $ns = CLIUtils::readNamespace($this->getCommand(), APP_DIR.'\\database', 'Provide us with a namespace for table class:'); + $ns = CLIUtils::readNamespace($this->getCommand(), APP_DIR.'\\Database', 'Provide us with a namespace for table class:'); $this->tableObjWriter->setNamespace($ns); $this->tableObjWriter->setPath(ROOT_PATH.DS.$ns); diff --git a/WebFiori/Framework/Cli/Helpers/CreateMiddleware.php b/WebFiori/Framework/Cli/Helpers/CreateMiddleware.php index 49db8bee4..32b7fbe35 100644 --- a/WebFiori/Framework/Cli/Helpers/CreateMiddleware.php +++ b/WebFiori/Framework/Cli/Helpers/CreateMiddleware.php @@ -35,7 +35,7 @@ public function __construct(CreateCommand $command) { $this->mdWriter = $this->getWriter(); } public function readClassInfo() { - $this->setClassInfo(APP_DIR.'\\middleware', 'Middleware'); + $this->setClassInfo(APP_DIR.'\\Middleware', 'Middleware'); $middlewareName = $this->getMiddlewareName(); $priority = $this->getCommand()->readInteger('Enter middleware priority:', 0); diff --git a/WebFiori/Framework/Cli/Helpers/CreateMigration.php b/WebFiori/Framework/Cli/Helpers/CreateMigration.php index f433de140..b208ce1e8 100644 --- a/WebFiori/Framework/Cli/Helpers/CreateMigration.php +++ b/WebFiori/Framework/Cli/Helpers/CreateMigration.php @@ -29,7 +29,7 @@ class CreateMigration extends CreateClassHelper { * @param CreateCommand $command A command that is used to call the class. */ public function __construct(CreateCommand $command) { - $ns = APP_DIR.'\\database\\migrations'; + $ns = APP_DIR.'\\Database\\migrations'; if (!$command->isArgProvided('--defaults')) { $ns = CLIUtils::readNamespace($command, $ns , 'Migration namespace:'); } diff --git a/WebFiori/Framework/Cli/Helpers/CreateTableObj.php b/WebFiori/Framework/Cli/Helpers/CreateTableObj.php index aa7a3960e..2d0111eee 100644 --- a/WebFiori/Framework/Cli/Helpers/CreateTableObj.php +++ b/WebFiori/Framework/Cli/Helpers/CreateTableObj.php @@ -43,7 +43,7 @@ public function readClassInfo() { $tempTable = new MSSQLTable(); } $this->getWriter()->setTable($tempTable); - $this->setClassInfo(APP_DIR.'\\database', 'Table'); + $this->setClassInfo(APP_DIR.'\\Database', 'Table'); $tableHelper = new TableObjHelper($this, $tempTable); $tableHelper->setTableName(CaseConverter::toSnakeCase($this->getWriter()->getName())); diff --git a/WebFiori/Framework/Cli/Helpers/CreateWebService.php b/WebFiori/Framework/Cli/Helpers/CreateWebService.php index b49acf925..6792c0e72 100644 --- a/WebFiori/Framework/Cli/Helpers/CreateWebService.php +++ b/WebFiori/Framework/Cli/Helpers/CreateWebService.php @@ -49,7 +49,7 @@ public function addRequestMethods() { } } public function readClassInfo() { - $this->setClassInfo(APP_DIR.'\\apis', 'Service'); + $this->setClassInfo(APP_DIR.'\\Apis', 'Service'); $this->setServiceName(); $this->serviceObj->setDescription($this->getInput('Description:')); diff --git a/WebFiori/Framework/Writers/LangClassWriter.php b/WebFiori/Framework/Writers/LangClassWriter.php index de71ccb67..9b9514ffa 100644 --- a/WebFiori/Framework/Writers/LangClassWriter.php +++ b/WebFiori/Framework/Writers/LangClassWriter.php @@ -34,7 +34,7 @@ class LangClassWriter extends ClassWriter { * @since 1.0 */ public function __construct($langCode, $writingDir) { - parent::__construct('Lang'.$langCode, APP_PATH.'langs', APP_DIR."\\langs"); + parent::__construct('Lang'.$langCode, APP_PATH.'Langs', APP_DIR."\\Langs"); $this->code = $langCode; $this->dir = $writingDir; $this->addUseStatement(Lang::class); From 1d4d2529248fb79e6bf04ce57556c9aa324a4b9d Mon Sep 17 00:00:00 2001 From: Ibrahim BinAlshikh Date: Wed, 8 Oct 2025 14:34:56 +0300 Subject: [PATCH 19/45] Update TableObjHelper.php --- WebFiori/Framework/Cli/Helpers/TableObjHelper.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/WebFiori/Framework/Cli/Helpers/TableObjHelper.php b/WebFiori/Framework/Cli/Helpers/TableObjHelper.php index 411dc0478..fbff68dc6 100644 --- a/WebFiori/Framework/Cli/Helpers/TableObjHelper.php +++ b/WebFiori/Framework/Cli/Helpers/TableObjHelper.php @@ -189,7 +189,7 @@ public function copyCheck() { $helper = $this->getCreateHelper(); if ($helper->confirm('Would you like to update same class or create a copy with the update?', false)) { - $info = $helper->getClassInfo(APP_DIR.'\\database', 'Table'); + $info = $helper->getClassInfo(APP_DIR.'\\Database', 'Table'); $helper->setClassName($info['name']); $helper->setNamespace($info['namespace']); $helper->setPath($info['path']); @@ -203,7 +203,7 @@ public function copyCheck() { */ public function createEntity() { $helper = $this->getCreateHelper(); - $entityInfo = $helper->getClassInfo(APP_DIR.'\\entity'); + $entityInfo = $helper->getClassInfo(APP_DIR.'\\Entity'); $entityInfo['implement-jsoni'] = $helper->confirm('Would you like from your entity class to implement the interface JsonI?', true); $helper->getWriter()->setEntityInfo($entityInfo['name'], $entityInfo['namespace'], $entityInfo['path'], $entityInfo['implement-jsoni']); From 18bdfb7640e5a7a3d12d264dc872252b327ab79e Mon Sep 17 00:00:00 2001 From: Ibrahim BinAlshikh Date: Wed, 8 Oct 2025 14:48:12 +0300 Subject: [PATCH 20/45] refactor: Namespaces Correction --- WebFiori/Framework/Cli/Commands/WHelpCommand.php | 2 +- .../Framework/Tests/Cli/CreateAPITestCaseTest.php | 12 ++++++------ .../Framework/Tests/Cli/CreateCLICommandTest.php | 14 +++++++------- .../Framework/Tests/Cli/CreateDBAccessTest.php | 10 +++++----- .../Framework/Tests/Cli/CreateMigrationTest.php | 6 +++--- .../Framework/Tests/Cli/CreateTableTest.php | 6 +++--- .../Framework/Tests/Cli/CreateWebServiceTest.php | 6 +++--- .../Framework/Tests/Cli/UpdateTableCommandTest.php | 6 +++--- .../Tests/Writers/CLICommandClassWriterTest.php | 6 +++--- .../Tests/Writers/WebServiceTestCaseWriterTest.php | 2 +- 10 files changed, 35 insertions(+), 35 deletions(-) diff --git a/WebFiori/Framework/Cli/Commands/WHelpCommand.php b/WebFiori/Framework/Cli/Commands/WHelpCommand.php index b743fed15..f0ddf589f 100644 --- a/WebFiori/Framework/Cli/Commands/WHelpCommand.php +++ b/WebFiori/Framework/Cli/Commands/WHelpCommand.php @@ -10,7 +10,7 @@ */ namespace WebFiori\Framework\Cli\Commands; -use WebFiori\Cli\commands\HelpCommand; +use WebFiori\Cli\Commands\HelpCommand; /** * Description of WHelpCommand * diff --git a/tests/WebFiori/Framework/Tests/Cli/CreateAPITestCaseTest.php b/tests/WebFiori/Framework/Tests/Cli/CreateAPITestCaseTest.php index b6c9b0992..c0f7797a0 100644 --- a/tests/WebFiori/Framework/Tests/Cli/CreateAPITestCaseTest.php +++ b/tests/WebFiori/Framework/Tests/Cli/CreateAPITestCaseTest.php @@ -119,17 +119,17 @@ public function testCreateAPITestCase03() { * @test */ public function testCreateAPITestCase04() { - $path = ROOT_PATH.DS."tests".DS."tests".DS."apis".DS."multiple"; + $path = ROOT_PATH.DS."tests".DS."tests".DS."Apis".DS."Multiple"; $this->assertEquals([ "Please enter services manager information:\n", "Test case will be created with following parameters:\n", "PHPUnit Version: 9\n", - 'Name: tests\tests\apis\multiple\WebService00Test'."\n", + 'Name: tests\tests\Apis\Multiple\WebService00Test'."\n", "Path: ".$path."\n", "Would you like to use default parameters?(Y/n)\n", "PHPUnit Version: Enter = '11'\n", "Enter a name for the new class:\n", - "Enter an optional namespace for the class: Enter = 'tests\\tests\apis\multiple'\n", + "Enter an optional namespace for the class: Enter = 'tests\\tests\Apis\Multiple'\n", "Info: New class was created at \"".$path."\".\n" ], $this->executeMultiCommand([ CreateCommand::class, @@ -175,12 +175,12 @@ public function testCreateAPITestCase06() { "Please enter services manager information:\n", "Test case will be created with following parameters:\n", "PHPUnit Version: 9\n", - 'Name: tests\tests\apis\multiple\WebService00Test'."\n", + 'Name: tests\tests\Apis\Multiple\WebService00Test'."\n", "Path: ".$path."\n", "Would you like to use default parameters?(Y/n)\n", "PHPUnit Version: Enter = '11'\n", "Enter a name for the new class:\n", - "Enter an optional namespace for the class: Enter = 'tests\\tests\apis\multiple'\n", + "Enter an optional namespace for the class: Enter = 'tests\\tests\Apis\Multiple'\n", "Info: New class was created at \"".$path."\".\n" ], $this->executeMultiCommand([ CreateCommand::class, @@ -218,7 +218,7 @@ public function testCreateAPITestCase07() { * @test */ public function testCreateAPITestCase08() { - $path = ROOT_PATH.DS."tests".DS."tests".DS."apis".DS."multiple"; + $path = ROOT_PATH.DS."tests".DS."tests".DS."Apis".DS."Multiple"; $this->assertEquals([ "Info: New class was created at \"".$path."\".\n" ], $this->executeMultiCommand([ diff --git a/tests/WebFiori/Framework/Tests/Cli/CreateCLICommandTest.php b/tests/WebFiori/Framework/Tests/Cli/CreateCLICommandTest.php index 142266a87..14180d78f 100644 --- a/tests/WebFiori/Framework/Tests/Cli/CreateCLICommandTest.php +++ b/tests/WebFiori/Framework/Tests/Cli/CreateCLICommandTest.php @@ -19,7 +19,7 @@ public function testCreateCommand00() { ], [ '5', 'NewCLI', - 'app\commands', + 'App\Commands', 'print-hello', 'Prints \'Hello World\' in the console.', 'N', @@ -42,21 +42,21 @@ public function testCreateCommand00() { "10: Database migration.\n", "11: Quit. <--\n", "Enter a name for the new class:\n", - "Enter an optional namespace for the class: Enter = 'app\commands'\n", + "Enter an optional namespace for the class: Enter = 'App\Commands'\n", "Enter a name for the command:\n", "Give a short description of the command:\n", "Would you like to add arguments to the command?(y/N)\n", 'Info: New class was created at "'.ROOT_PATH.DS.'App'.DS."commands\".\n", ], $output); - $this->assertTrue(class_exists('\\app\\commands\\NewCLICommand')); - $this->removeClass('\\app\\commands\\NewCLICommand'); + $this->assertTrue(class_exists('\\App\\Commands\\NewCLICommand')); + $this->removeClass('\\App\\Commands\\NewCLICommand'); } /** * @test */ public function testCreateCommand01() { - $clazz = '\\app\\commands\\DoItCommand'; + $clazz = '\\App\\Commands\\DoItCommand'; if (class_exists($clazz)) { $this->removeClass($clazz); } @@ -67,7 +67,7 @@ public function testCreateCommand01() { '--c' => 'command' ], [ 'DoIt', - 'app\commands', + 'App\Commands', 'do-it', 'Do something amazing.', 'y', @@ -88,7 +88,7 @@ public function testCreateCommand01() { $this->assertEquals(0, $this->getExitCode()); $this->assertEquals([ "Enter a name for the new class:\n", - "Enter an optional namespace for the class: Enter = 'app\commands'\n", + "Enter an optional namespace for the class: Enter = 'App\Commands'\n", "Enter a name for the command:\n", "Give a short description of the command:\n", "Would you like to add arguments to the command?(y/N)\n", diff --git a/tests/WebFiori/Framework/Tests/Cli/CreateDBAccessTest.php b/tests/WebFiori/Framework/Tests/Cli/CreateDBAccessTest.php index 241d59b0b..b0421c70f 100644 --- a/tests/WebFiori/Framework/Tests/Cli/CreateDBAccessTest.php +++ b/tests/WebFiori/Framework/Tests/Cli/CreateDBAccessTest.php @@ -25,9 +25,9 @@ public function test00() { ], [ 'Tables\\EmployeeInfoTable', 'EmployeeOperations', - "\n", // Hit Enter to pick default value (app\database) + "\n", // Hit Enter to pick default value (App\database) 'SuperUser', - "\n", // Hit Enter to pick default value (app\entity) + "\n", // Hit Enter to pick default value (App\entity) 'n' ]); @@ -60,9 +60,9 @@ public function test01() { ], [ 'Tables\\EmployeeInfoTable', 'EmployeeS', - 'App\\Database\\empl', + 'App\\Database\\Empl', 'SuperHero', - 'App\\Entity\\subs', + 'App\\Entity\\Subs', 'y' ]); @@ -79,7 +79,7 @@ public function test01() { "Would you like to have update methods for every single column?(y/N)\n", "Info: New class was created at \"". ROOT_PATH.DS."app".DS."database".DS."empl\".\n" ], $output); - $clazz = '\\App\\Database\\empl\\EmployeeSDB'; + $clazz = '\\App\\Database\\Empl\\EmployeeSDB'; $this->assertTrue(class_exists($clazz)); $this->removeClass($clazz); } diff --git a/tests/WebFiori/Framework/Tests/Cli/CreateMigrationTest.php b/tests/WebFiori/Framework/Tests/Cli/CreateMigrationTest.php index 55c08f262..6546590e5 100644 --- a/tests/WebFiori/Framework/Tests/Cli/CreateMigrationTest.php +++ b/tests/WebFiori/Framework/Tests/Cli/CreateMigrationTest.php @@ -11,7 +11,7 @@ class CreateMigrationTest extends CLITestCase { protected function tearDown(): void { // Clean up only specific migration files created by this test - $migrationsDir = APP_PATH . DS . 'Database' . DS . 'migrations'; + $migrationsDir = APP_PATH . DS . 'Database' . DS . 'Migrations'; if (is_dir($migrationsDir)) { // Only remove Migration files directly in the migrations directory $files = glob($migrationsDir . DS . 'Migration[0-9][0-9][0-9].php'); @@ -36,10 +36,10 @@ protected function tearDown(): void { public function testCreateMigration01() { $name = 'CoolMigration'; - $clazz = '\\App\\Database\\migrations\\'.$name; + $clazz = '\\App\\Database\\Migrations\\'.$name; $this->assertEquals([ - "Migration namespace: Enter = 'app\database\migrations'\n", + "Migration namespace: Enter = 'App\Database\Migrations'\n", "Provide a name for the class that will have migration logic:\n", 'Info: New class was created at "'. APP_PATH .'Database'.DS.'migrations".'."\n", ], $this->executeMultiCommand([ diff --git a/tests/WebFiori/Framework/Tests/Cli/CreateTableTest.php b/tests/WebFiori/Framework/Tests/Cli/CreateTableTest.php index 45084a699..ad8447b23 100644 --- a/tests/WebFiori/Framework/Tests/Cli/CreateTableTest.php +++ b/tests/WebFiori/Framework/Tests/Cli/CreateTableTest.php @@ -72,7 +72,7 @@ public function testCreateTable00() { ], [ 'mysql', 'Cool00Table', - "\n", // Hit Enter to pick default value (app\database) + "\n", // Hit Enter to pick default value (App\database) 'cool_table_00', 'This is the first cool table that was created using CLI.', 'id', @@ -135,7 +135,7 @@ public function testCreateTable01() { ], [ 'mssql', 'Cool01Table', - "\n", // Hit Enter to pick default value (app\database) + "\n", // Hit Enter to pick default value (App\database) 'cool_table_01', 'This is the first cool table that was created using CLI.', 'id', @@ -199,7 +199,7 @@ public function testCreateTable02() { ], [ 'mysql', 'Cool02Table', - "\n", // Hit Enter to pick default value (app\database) + "\n", // Hit Enter to pick default value (App\database) 'cool_table_02', "\n", // Hit Enter to pick default value (empty comment) 'id', diff --git a/tests/WebFiori/Framework/Tests/Cli/CreateWebServiceTest.php b/tests/WebFiori/Framework/Tests/Cli/CreateWebServiceTest.php index 7ef11a668..42ed696ea 100644 --- a/tests/WebFiori/Framework/Tests/Cli/CreateWebServiceTest.php +++ b/tests/WebFiori/Framework/Tests/Cli/CreateWebServiceTest.php @@ -24,7 +24,7 @@ public function test00() { ], [ '2', 'NewWeb', - "\n", // Hit Enter to pick default value (app\apis) + "\n", // Hit Enter to pick default value (App\Apis) 'get-hello', 'Service Desc', "\n", // Hit Enter to pick default value (GET method) @@ -125,7 +125,7 @@ public function test01() { '--c' => 'web-service' ], [ 'NewWeb2', - "\n", // Hit Enter to pick default value (app\apis) + "\n", // Hit Enter to pick default value (App\Apis) 'get-hello-2', 'Service\'s Desc', "\n", // Hit Enter to pick default value (GET method) @@ -224,7 +224,7 @@ public function test02() { '--c' => 'web-service' ], [ 'NewWeb3', - "\n", // Hit Enter to pick default value (app\apis) + "\n", // Hit Enter to pick default value (App\Apis) 'get-hello-3', 'Service\'s Desc', "\n", // Hit Enter to pick default value (GET method) diff --git a/tests/WebFiori/Framework/Tests/Cli/UpdateTableCommandTest.php b/tests/WebFiori/Framework/Tests/Cli/UpdateTableCommandTest.php index 8171040fd..cfa412ef4 100644 --- a/tests/WebFiori/Framework/Tests/Cli/UpdateTableCommandTest.php +++ b/tests/WebFiori/Framework/Tests/Cli/UpdateTableCommandTest.php @@ -26,7 +26,7 @@ public function test00() { 'Cool new column.', 'y', 'ModifiedO', - "\n" // Hit Enter to pick default value (app\database) + "\n" // Hit Enter to pick default value (App\database) ]); $this->assertEquals(0, $this->getExitCode()); @@ -107,7 +107,7 @@ public function test01() { 'Cool modifiyed column.', 'y', 'Modified', - "\n" // Hit Enter to pick default value (app\database) + "\n" // Hit Enter to pick default value (App\database) ]); $this->assertEquals(0, $this->getExitCode()); @@ -175,7 +175,7 @@ public function test02() { '0', 'y', 'Modified2', - "\n" // Hit Enter to pick default value (app\database) + "\n" // Hit Enter to pick default value (App\database) ]); $this->assertEquals(0, $this->getExitCode()); diff --git a/tests/WebFiori/Framework/Tests/Writers/CLICommandClassWriterTest.php b/tests/WebFiori/Framework/Tests/Writers/CLICommandClassWriterTest.php index 165df1b7d..9c02dc46a 100644 --- a/tests/WebFiori/Framework/Tests/Writers/CLICommandClassWriterTest.php +++ b/tests/WebFiori/Framework/Tests/Writers/CLICommandClassWriterTest.php @@ -13,7 +13,7 @@ public function test00() { $writer = new CommandClassWriter(); $this->assertEquals('NewCommand', $writer->getName()); $this->assertEquals(ROOT_PATH.DS.APP_DIR.DS.'Commands'.DS.'NewCommand.php', $writer->getAbsolutePath()); - $this->assertEquals('app\\commands', $writer->getNamespace()); + $this->assertEquals('App\\Commands', $writer->getNamespace()); $this->assertEquals('new-command', $writer->getCommandName()); $this->assertEquals('', $writer->getDescription()); $this->assertEquals([], $writer->getArgs()); @@ -38,7 +38,7 @@ public function test01() { $this->assertTrue($writer->setClassName('DoItXCommand')); $this->assertEquals('DoItXCommand', $writer->getName()); $this->assertEquals(ROOT_PATH.DS.APP_DIR.DS.'Commands'.DS.'DoItXCommand.php', $writer->getAbsolutePath()); - $this->assertEquals('app\\commands', $writer->getNamespace()); + $this->assertEquals('App\\Commands', $writer->getNamespace()); $this->assertEquals('Lets-Do-It', $writer->getCommandName()); $this->assertEquals('', $writer->getDescription()); $this->assertEquals([], $writer->getArgs()); @@ -81,7 +81,7 @@ public function test02() { $this->assertTrue($writer->setClassName('DoItX2Command')); $this->assertEquals('DoItX2Command', $writer->getName()); $this->assertEquals(ROOT_PATH.DS.APP_DIR.DS.'Commands'.DS.'DoItX2Command.php', $writer->getAbsolutePath()); - $this->assertEquals('app\\commands', $writer->getNamespace()); + $this->assertEquals('App\\Commands', $writer->getNamespace()); $this->assertEquals('Lets-Do-It', $writer->getCommandName()); $this->assertEquals('', $writer->getDescription()); $this->assertEquals([], $writer->getArgs()); diff --git a/tests/WebFiori/Framework/Tests/Writers/WebServiceTestCaseWriterTest.php b/tests/WebFiori/Framework/Tests/Writers/WebServiceTestCaseWriterTest.php index 30df30828..6e409bf07 100644 --- a/tests/WebFiori/Framework/Tests/Writers/WebServiceTestCaseWriterTest.php +++ b/tests/WebFiori/Framework/Tests/Writers/WebServiceTestCaseWriterTest.php @@ -15,7 +15,7 @@ class WebServiceTestCaseWriterTest extends CLITestCase { */ public function test00() { $w = new APITestCaseWriter(new TasksServicesManager(), ForceTaskExecutionService::class); - $this->assertEquals('tests\\apis\\WebServiceTest', $w->getName(true)); + $this->assertEquals('tests\\Apis\\WebServiceTest', $w->getName(true)); $this->assertEquals(9, $w->getPhpUnitVersion()); $this->assertEquals(ROOT_PATH.DS.'Tests'.DS.'Apis'.DS.'WebServiceTest.php', $w->getAbsolutePath()); $w->writeClass(); From b3f602ec0d42e233cfaa363bef6e8b32c0e57279 Mon Sep 17 00:00:00 2001 From: Ibrahim BinAlshikh Date: Wed, 8 Oct 2025 15:07:01 +0300 Subject: [PATCH 21/45] refactor: Correction of Namespaces --- WebFiori/Framework/Cli/Commands/AddCommand.php | 2 +- WebFiori/Framework/Config/ClassDriver.php | 2 +- WebFiori/Framework/Lang.php | 2 +- .../Framework/Tests/Cli/AddCommandTest.php | 2 +- .../Framework/Tests/Cli/CreateAPITestCaseTest.php | 14 +++++++------- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/WebFiori/Framework/Cli/Commands/AddCommand.php b/WebFiori/Framework/Cli/Commands/AddCommand.php index 6727899f8..60c08c4b6 100644 --- a/WebFiori/Framework/Cli/Commands/AddCommand.php +++ b/WebFiori/Framework/Cli/Commands/AddCommand.php @@ -128,7 +128,7 @@ private function addLang(): int { $writer = new LangClassWriter($langCode, $writingDir); $writer->writeClass(); $this->success('Language added. Also, a class for the language ' - .'is created at "'.APP_DIR.'\langs" for that language.'); + .'is created at "'.APP_DIR.'\Langs" for that language.'); return 0; } diff --git a/WebFiori/Framework/Config/ClassDriver.php b/WebFiori/Framework/Config/ClassDriver.php index 0757cd1a5..bc3880708 100644 --- a/WebFiori/Framework/Config/ClassDriver.php +++ b/WebFiori/Framework/Config/ClassDriver.php @@ -1302,7 +1302,7 @@ private function writeSiteTitles($cFile) { $title = str_replace("'", "\'", $title); self::a($cFile, " '$langCode' => '$title',"); - if (!class_exists(APP_DIR.'\\langs\\Lang'.$langCode)) { + if (!class_exists(APP_DIR.'\\Langs\\Lang'.$langCode)) { //This requires a fix in the future $dir = $langCode == 'AR' ? 'rtl' : 'ltr'; diff --git a/WebFiori/Framework/Lang.php b/WebFiori/Framework/Lang.php index af83c2493..54113e361 100644 --- a/WebFiori/Framework/Lang.php +++ b/WebFiori/Framework/Lang.php @@ -310,7 +310,7 @@ public static function loadTranslation(string $langCode) { return self::getActive(); } - $langClassName = APP_DIR.'\\langs\\Lang'.$uLangCode; + $langClassName = APP_DIR.'\\Langs\\Lang'.$uLangCode; if (!class_exists($langClassName)) { throw new MissingLangException('No language class was found for the language \''.$uLangCode.'\'.'); diff --git a/tests/WebFiori/Framework/Tests/Cli/AddCommandTest.php b/tests/WebFiori/Framework/Tests/Cli/AddCommandTest.php index 26a77267d..35559ab3d 100644 --- a/tests/WebFiori/Framework/Tests/Cli/AddCommandTest.php +++ b/tests/WebFiori/Framework/Tests/Cli/AddCommandTest.php @@ -196,7 +196,7 @@ public function testAddLang00() { "Select writing direction:\n", "0: ltr\n", "1: rtl\n", - "Success: Language added. Also, a class for the language is created at \"".APP_DIR."\langs\" for that language.\n" + "Success: Language added. Also, a class for the language is created at \"".APP_DIR."\Langs\" for that language.\n" ], $output); $this->assertTrue(class_exists('\\App\\Langs\\Lang' . $langCode)); $this->removeClass('\\App\\Langs\\Lang' . $langCode); diff --git a/tests/WebFiori/Framework/Tests/Cli/CreateAPITestCaseTest.php b/tests/WebFiori/Framework/Tests/Cli/CreateAPITestCaseTest.php index c0f7797a0..b77370ecb 100644 --- a/tests/WebFiori/Framework/Tests/Cli/CreateAPITestCaseTest.php +++ b/tests/WebFiori/Framework/Tests/Cli/CreateAPITestCaseTest.php @@ -38,7 +38,7 @@ public function testCreateAPITestCase01() { "4: set-password\n", "Test case will be created with following parameters:\n", "PHPUnit Version: 9\n", - 'Name: tests\WebFiori\\Framework\scheduler\webServices\\TasksLoginServiceTest'."\n", + 'Name: tests\WebFiori\\Framework\Scheduler\WebServices\\TasksLoginServiceTest'."\n", "Path: ".$path."\n", "Would you like to use default parameters?(Y/n)\n", "Info: New class was created at \"".$path."\".\n" @@ -53,7 +53,7 @@ public function testCreateAPITestCase01() { ])); $this->assertEquals(0, $this->getExitCode()); - $clazz = '\\tests\WebFiori\\Framework\scheduler\webServices\\TasksLoginServiceTest'; + $clazz = '\\tests\WebFiori\\Framework\Scheduler\WebServices\\TasksLoginServiceTest'; $this->assertTrue(file_exists($path.DS.'TasksLoginServiceTest.php')); require_once $path.DS.'TasksLoginServiceTest.php'; $this->assertTrue(class_exists($clazz)); @@ -74,7 +74,7 @@ public function testCreateAPITestCase02() { '--defaults' ])); $this->assertEquals(0, $this->getExitCode()); - $clazz = '\\tests\WebFiori\\Framework\scheduler\webServices\\GetTasksServiceTest'; + $clazz = '\\tests\WebFiori\\Framework\Scheduler\WebServices\\GetTasksServiceTest'; $this->assertTrue(file_exists($path.DS.'GetTasksServiceTest.php')); require_once $path.DS.'GetTasksServiceTest.php'; $this->assertTrue(class_exists($clazz)); @@ -89,19 +89,19 @@ public function testCreateAPITestCase03() { "Please enter services manager information:\n", "Test case will be created with following parameters:\n", "PHPUnit Version: 9\n", - 'Name: tests\WebFiori\\Framework\scheduler\webServices\\GetTasksServiceTest'."\n", + 'Name: tests\WebFiori\\Framework\Scheduler\WebServices\\GetTasksServiceTest'."\n", "Path: ".$path."\n", "Would you like to use default parameters?(Y/n)\n", "PHPUnit Version: Enter = '11'\n", "Enter a name for the new class:\n", - "Enter an optional namespace for the class: Enter = 'tests\WebFiori\\Framework\scheduler\webServices'\n", + "Enter an optional namespace for the class: Enter = 'tests\WebFiori\\Framework\Scheduler\WebServices'\n", "Info: New class was created at \"".$path."\".\n" ], $this->executeMultiCommand([ CreateCommand::class, '--c' => 'api-test', '--service' => 'get-tasks', ], [ - '\WebFiori\\Framework\scheduler\webServices\\TasksServicesManager', + '\WebFiori\\Framework\Scheduler\WebServices\\TasksServicesManager', 'n', '10', '', @@ -109,7 +109,7 @@ public function testCreateAPITestCase03() { ])); $this->assertEquals(0, $this->getExitCode()); - $clazz = '\\tests\WebFiori\\Framework\scheduler\webServices\\GetTasksServiceTest'; + $clazz = '\\tests\WebFiori\\Framework\Scheduler\WebServices\\GetTasksServiceTest'; $this->assertTrue(file_exists($path.DS.'GetTasksServiceTest.php')); require_once $path.DS.'GetTasksServiceTest.php'; $this->assertTrue(class_exists($clazz)); From b28b10be4ae1af5c68ed1dd236fc8f0befbacea9 Mon Sep 17 00:00:00 2001 From: Ibrahim BinAlshikh Date: Wed, 8 Oct 2025 15:11:23 +0300 Subject: [PATCH 22/45] Update App.php --- WebFiori/Framework/App.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/WebFiori/Framework/App.php b/WebFiori/Framework/App.php index ace32b652..ae888933d 100644 --- a/WebFiori/Framework/App.php +++ b/WebFiori/Framework/App.php @@ -168,8 +168,7 @@ private function __construct() { * Register CLI commands or background tasks. * * @param string $folder The name of the folder that contains the jobs or - * commands. It must be a folder inside 'app' folder or the folder which is defined - * by the constant 'APP_DIR'. + * commands. It must be a folder inside [APP_DIR]. * * @param callable $regCallback A callback which is used to register the * classes of the folder. From 94e16a72ff37f9bce736facfa145cb6c2ced264f Mon Sep 17 00:00:00 2001 From: Ibrahim BinAlshikh Date: Wed, 8 Oct 2025 15:29:00 +0300 Subject: [PATCH 23/45] refactor: Path and Namespace Correction --- WebFiori/Framework/App.php | 10 +++++----- .../Cli/Helpers/CreateThemeHelper.php | 2 +- .../Framework/Session/SessionsManager.php | 4 ++-- tests/WebFiori/Framework/Tests/AccessTest.php | 2 +- .../Tests/Cli/CreateAPITestCaseTest.php | 20 +++++++++---------- .../Framework/Tests/Cli/CreateThemeTest.php | 16 +++++++-------- .../Framework/Tests/Langs/LanguageTest.php | 4 ++-- .../Framework/Tests/Mail/EmailMessageTest.php | 2 +- tests/WebFiori/Framework/Tests/PageTest.php | 2 +- .../Framework/Tests/PrivilegeTest.php | 2 +- tests/WebFiori/Framework/Tests/UserTest.php | 2 +- tests/WebFiori/Framework/Tests/UtilTest.php | 2 +- .../Writers/WebServiceTestCaseWriterTest.php | 6 +++--- 13 files changed, 37 insertions(+), 37 deletions(-) diff --git a/WebFiori/Framework/App.php b/WebFiori/Framework/App.php index ae888933d..350bdc84d 100644 --- a/WebFiori/Framework/App.php +++ b/WebFiori/Framework/App.php @@ -273,10 +273,10 @@ public static function getConfigDriver() : string { } private static function getRoot() { //Following lines of code assumes that the class exist on the folder: - //\vendor\WebFiori\framework\WebFiori\framework + //\vendor\WebFiori\framework\WebFiori\Framework //Its used to construct the folder at which index file will exist at $DS = DIRECTORY_SEPARATOR; - $vendorPath = $DS.'vendor'.$DS.'WebFiori'.$DS.'framework'.$DS.'WebFiori'.$DS.'framework'; + $vendorPath = $DS.'vendor'.$DS.'webFiori'.$DS.'framework'.$DS.'WebFiori'.$DS.'Framework'; $rootPath = substr(__DIR__, 0, strlen(__DIR__) - strlen($vendorPath)); return $rootPath; } @@ -614,8 +614,8 @@ private static function initAutoLoader() { /** * Initialize autoloader. */ - if (!class_exists('WebFiori\framework\autoload\ClassLoader',false)) { - $autoloader = WF_CORE_PATH.DIRECTORY_SEPARATOR.'autoload'.DIRECTORY_SEPARATOR.'ClassLoader.php'; + if (!class_exists('WebFiori\Framework\Autoload\ClassLoader',false)) { + $autoloader = WF_CORE_PATH.DIRECTORY_SEPARATOR.'Autoload'.DIRECTORY_SEPARATOR.'ClassLoader.php'; require_once $autoloader; } self::$AU = ClassLoader::get(); @@ -721,7 +721,7 @@ private function initScheduler() { } private function initThemesPath() { if (!defined('THEMES_PATH')) { - $themesDirName = 'themes'; + $themesDirName = 'Themes'; $themesPath = ROOT_PATH.DS.$themesDirName; /** * This constant represents the directory at which themes exist. diff --git a/WebFiori/Framework/Cli/Helpers/CreateThemeHelper.php b/WebFiori/Framework/Cli/Helpers/CreateThemeHelper.php index 9c2248a13..5a487d7cf 100644 --- a/WebFiori/Framework/Cli/Helpers/CreateThemeHelper.php +++ b/WebFiori/Framework/Cli/Helpers/CreateThemeHelper.php @@ -27,7 +27,7 @@ public function __construct(CreateCommand $command) { parent::__construct($command, new ThemeClassWriter('New Theme')); } public function readClassInfo() { - $this->setClassInfo('themes', 'Theme'); + $this->setClassInfo('Themes', 'Theme'); $this->println('Creating theme at "'.$this->getWriter()->getPath().'"...'); $this->writeClass(); diff --git a/WebFiori/Framework/Session/SessionsManager.php b/WebFiori/Framework/Session/SessionsManager.php index b67cd53e3..6d9905559 100644 --- a/WebFiori/Framework/Session/SessionsManager.php +++ b/WebFiori/Framework/Session/SessionsManager.php @@ -65,10 +65,10 @@ private function __construct() { $constructor = WF_SESSION_STORAGE.''; $classObj = new $constructor(); - if (is_subclass_of($classObj, '\WebFiori\framework\session\SessionStorage')) { + if (is_subclass_of($classObj, '\WebFiori\Framework\Session\SessionStorage')) { $this->sessionStorage = $classObj; } else { - throw new SessionException('The class "'.WF_SESSION_STORAGE.'" does not implement "\WebFiori\framework\session\SessionStorage".'); + throw new SessionException('The class "'.WF_SESSION_STORAGE.'" does not implement "\WebFiori\Framework\Session\SessionStorage".'); } } diff --git a/tests/WebFiori/Framework/Tests/AccessTest.php b/tests/WebFiori/Framework/Tests/AccessTest.php index b205ea2f3..1cd487788 100644 --- a/tests/WebFiori/Framework/Tests/AccessTest.php +++ b/tests/WebFiori/Framework/Tests/AccessTest.php @@ -5,7 +5,7 @@ use WebFiori\Framework\Access; use WebFiori\Framework\User; /** - * A test class for testing the class 'WebFiori\framework\Access'. + * A test class for testing the class 'WebFiori\Framework\Access'. * * @author Ibrahim */ diff --git a/tests/WebFiori/Framework/Tests/Cli/CreateAPITestCaseTest.php b/tests/WebFiori/Framework/Tests/Cli/CreateAPITestCaseTest.php index b77370ecb..816a5c935 100644 --- a/tests/WebFiori/Framework/Tests/Cli/CreateAPITestCaseTest.php +++ b/tests/WebFiori/Framework/Tests/Cli/CreateAPITestCaseTest.php @@ -136,7 +136,7 @@ public function testCreateAPITestCase04() { '--c' => 'api-test', '--service' => 'say-hi-service', ], [ - '\\Tests\\Apis\\Multiple\\ServicesManager00', + '\\tests\\Apis\\Multiple\\ServicesManager00', 'n', '10', '', @@ -144,7 +144,7 @@ public function testCreateAPITestCase04() { ])); $this->assertEquals(0, $this->getExitCode()); - $clazz = '\\tests\\Tests\\Apis\\Multiple\\WebService00Test'; + $clazz = '\\tests\\tests\\Apis\\Multiple\\WebService00Test'; $this->assertTrue(file_exists($path.DS.'WebService00Test.php')); require_once $path.DS.'WebService00Test.php'; $this->assertTrue(class_exists($clazz)); @@ -160,7 +160,7 @@ public function testCreateAPITestCase05() { ], $this->executeMultiCommand([ CreateCommand::class, '--c' => 'api-test', - '--manager' => '\\Tests\\Apis\\EmptyService\\EmptyServicesManager', + '--manager' => '\\tests\\Apis\\EmptyService\\EmptyServicesManager', ])); $this->assertEquals(-1, $this->getExitCode()); } @@ -187,15 +187,15 @@ public function testCreateAPITestCase06() { '--c' => 'api-test', '--service' => 'say-hi-service', ], [ - '\\Tests\\Apis\\Multiple\\WebService00', - '\\Tests\\Apis\\Multiple\\ServicesManager00', + '\\tests\\Apis\\Multiple\\WebService00', + '\\tests\\Apis\\Multiple\\ServicesManager00', 'n', '10', '', '', ])); $this->assertEquals(0, $this->getExitCode()); - $clazz = '\\tests\\Tests\\Apis\\Multiple\\WebService00Test'; + $clazz = '\\tests\\tests\\Apis\\Multiple\\WebService00Test'; $this->assertTrue(file_exists($path.DS.'WebService00Test.php')); require_once $path.DS.'WebService00Test.php'; $this->assertTrue(class_exists($clazz)); @@ -206,11 +206,11 @@ public function testCreateAPITestCase06() { */ public function testCreateAPITestCase07() { $this->assertEquals([ - "Error: The argument --manager has invalid value: Not a class: \\Tests\\Apis\\EmptyService\\Xyz\n", + "Error: The argument --manager has invalid value: Not a class: \\tests\\Apis\\EmptyService\\Xyz\n", ], $this->executeMultiCommand([ CreateCommand::class, '--c' => 'api-test', - '--manager' => '\\Tests\\Apis\\EmptyService\\Xyz', + '--manager' => '\\tests\\Apis\\EmptyService\\Xyz', ])); $this->assertEquals(-1, $this->getExitCode()); } @@ -225,11 +225,11 @@ public function testCreateAPITestCase08() { CreateCommand::class, '--c' => 'api-test', '--service' => 'say-hi-service-2', - '--manager' => '\\Tests\\Apis\\Multiple\\ServicesManager00', + '--manager' => '\\tests\\Apis\\Multiple\\ServicesManager00', '--defaults' ])); $this->assertEquals(0, $this->getExitCode()); - $clazz = '\\tests\\Tests\\Apis\\Multiple\\WebService01Test'; + $clazz = '\\tests\\tests\\Apis\\Multiple\\WebService01Test'; $this->assertTrue(file_exists($path.DS.'WebService01Test.php')); require_once $path.DS.'WebService01Test.php'; $this->assertTrue(class_exists($clazz)); diff --git a/tests/WebFiori/Framework/Tests/Cli/CreateThemeTest.php b/tests/WebFiori/Framework/Tests/Cli/CreateThemeTest.php index 27f24f21a..d8325b7be 100644 --- a/tests/WebFiori/Framework/Tests/Cli/CreateThemeTest.php +++ b/tests/WebFiori/Framework/Tests/Cli/CreateThemeTest.php @@ -22,7 +22,7 @@ public function testCreateTheme00() { ], [ '6', 'NewTest', - 'themes\\fiori', + 'Themes\\Fiori', "\n", // Hit Enter to pick default value ]); $this->assertEquals(0, $this->getExitCode()); @@ -46,13 +46,13 @@ public function testCreateTheme00() { 'Info: New class was created at "'.ROOT_PATH.DS.'Themes'.DS."fiori\".\n", ], $output); - $this->assertTrue(class_exists('\\themes\\fiori\\NewTestTheme')); + $this->assertTrue(class_exists('\\Themes\\Fiori\\NewTestTheme')); - $this->removeClass('\\themes\\fiori\\NewTestTheme'); - $this->removeClass('\\themes\\fiori\\AsideSection'); - $this->removeClass('\\themes\\fiori\\FooterSection'); - $this->removeClass('\\themes\\fiori\\HeadSection'); - $this->removeClass('\\themes\\fiori\\HeaderSection'); + $this->removeClass('\\Themes\\Fiori\\NewTestTheme'); + $this->removeClass('\\Themes\\Fiori\\AsideSection'); + $this->removeClass('\\Themes\\Fiori\\FooterSection'); + $this->removeClass('\\Themes\\Fiori\\HeadSection'); + $this->removeClass('\\Themes\\Fiori\\HeaderSection'); } /** @@ -63,7 +63,7 @@ public function testCreateThemeWithExistingName() { $ns = '\\Themes\\FioriTheme'; $name = 'NewFTestTheme'; - $ns2 = '\\themes\\cool'; + $ns2 = '\\Themes\\Cool'; $name2 = 'NewFTestTheme'; $output = $this->executeSingleCommand(new CreateCommand(), [ diff --git a/tests/WebFiori/Framework/Tests/Langs/LanguageTest.php b/tests/WebFiori/Framework/Tests/Langs/LanguageTest.php index 6ea4d38f1..c51562374 100644 --- a/tests/WebFiori/Framework/Tests/Langs/LanguageTest.php +++ b/tests/WebFiori/Framework/Tests/Langs/LanguageTest.php @@ -210,7 +210,7 @@ public function testLoadTranslation01() { */ public function testLoadTranslation02() { $this->expectException(Exception::class); - $this->expectExceptionMessage('A language class for the language \'FR\' was found. But it is not a sub class of \'WebFiori\framework\Lang\'.'); + $this->expectExceptionMessage('A language class for the language \'FR\' was found. But it is not a sub class of \'WebFiori\Framework\Lang\'.'); Lang::loadTranslation('fr'); } /** @@ -221,7 +221,7 @@ public function testLoadTranslation02() { */ public function testLoadTranslation03() { $this->expectException(Exception::class); - $this->expectExceptionMessage('The translation file was found. But no object of type \'WebFiori\framework\Lang\' is stored. Make sure that the parameter ' + $this->expectExceptionMessage('The translation file was found. But no object of type \'WebFiori\Framework\Lang\' is stored. Make sure that the parameter ' .'$addtoLoadedAfterCreate is set to true when creating the language object.'); Lang::loadTranslation('Jp'); } diff --git a/tests/WebFiori/Framework/Tests/Mail/EmailMessageTest.php b/tests/WebFiori/Framework/Tests/Mail/EmailMessageTest.php index 03cedf51e..4049abfc0 100644 --- a/tests/WebFiori/Framework/Tests/Mail/EmailMessageTest.php +++ b/tests/WebFiori/Framework/Tests/Mail/EmailMessageTest.php @@ -8,7 +8,7 @@ use WebFiori\Framework\EmailMessage; use WebFiori\Framework\Exceptions\MissingLangException; /** - * A test class for testing the class 'WebFiori\framework\mail\EmailMessage'. + * A test class for testing the class 'WebFiori\Framework\Mail\EmailMessage'. * * @author Ibrahim */ diff --git a/tests/WebFiori/Framework/Tests/PageTest.php b/tests/WebFiori/Framework/Tests/PageTest.php index 493767024..98490a19d 100644 --- a/tests/WebFiori/Framework/Tests/PageTest.php +++ b/tests/WebFiori/Framework/Tests/PageTest.php @@ -764,7 +764,7 @@ public function testTheme02() { $page->setTheme(' New Super Theme '); $theme3 = $page->getTheme(); - $this->assertTrue($theme3 instanceof \WebFiori\framework\Theme); + $this->assertTrue($theme3 instanceof \WebFiori\Framework\Theme); } /** * @test diff --git a/tests/WebFiori/Framework/Tests/PrivilegeTest.php b/tests/WebFiori/Framework/Tests/PrivilegeTest.php index dfb71ba8c..b60755797 100644 --- a/tests/WebFiori/Framework/Tests/PrivilegeTest.php +++ b/tests/WebFiori/Framework/Tests/PrivilegeTest.php @@ -4,7 +4,7 @@ use PHPUnit\Framework\TestCase; use WebFiori\Framework\Privilege; /** - * A test class for testing the class 'WebFiori\framework\Privilege'. + * A test class for testing the class 'WebFiori\Framework\Privilege'. * * @author Ibrahim */ diff --git a/tests/WebFiori/Framework/Tests/UserTest.php b/tests/WebFiori/Framework/Tests/UserTest.php index 57cded44c..4577872b2 100644 --- a/tests/WebFiori/Framework/Tests/UserTest.php +++ b/tests/WebFiori/Framework/Tests/UserTest.php @@ -5,7 +5,7 @@ use WebFiori\Framework\Access; use WebFiori\Framework\User; /** - * A test class for testing the class 'WebFiori\framework\User'. + * A test class for testing the class 'WebFiori\Framework\User'. * * @author Ibrahim */ diff --git a/tests/WebFiori/Framework/Tests/UtilTest.php b/tests/WebFiori/Framework/Tests/UtilTest.php index 33189db33..673da9222 100644 --- a/tests/WebFiori/Framework/Tests/UtilTest.php +++ b/tests/WebFiori/Framework/Tests/UtilTest.php @@ -4,7 +4,7 @@ use PHPUnit\Framework\TestCase; use WebFiori\Framework\Util; /** - * A test class for testing the class 'WebFiori\framework\Util'. + * A test class for testing the class 'WebFiori\Framework\Util'. * * @author Ibrahim */ diff --git a/tests/WebFiori/Framework/Tests/Writers/WebServiceTestCaseWriterTest.php b/tests/WebFiori/Framework/Tests/Writers/WebServiceTestCaseWriterTest.php index 6e409bf07..c7c75435a 100644 --- a/tests/WebFiori/Framework/Tests/Writers/WebServiceTestCaseWriterTest.php +++ b/tests/WebFiori/Framework/Tests/Writers/WebServiceTestCaseWriterTest.php @@ -17,7 +17,7 @@ public function test00() { $w = new APITestCaseWriter(new TasksServicesManager(), ForceTaskExecutionService::class); $this->assertEquals('tests\\Apis\\WebServiceTest', $w->getName(true)); $this->assertEquals(9, $w->getPhpUnitVersion()); - $this->assertEquals(ROOT_PATH.DS.'Tests'.DS.'Apis'.DS.'WebServiceTest.php', $w->getAbsolutePath()); + $this->assertEquals(ROOT_PATH.DS.'tests'.DS.'Apis'.DS.'WebServiceTest.php', $w->getAbsolutePath()); $w->writeClass(); $this->assertTrue(class_exists('\\'.$w->getName(true))); unlink($w->getAbsolutePath()); @@ -29,10 +29,10 @@ public function test01() { $w = new APITestCaseWriter(new TasksServicesManager(), new ForceTaskExecutionService()); $w->setClassName('Cool'); $w->setNamespace('\\tests\\cool'); - $w->setPath(ROOT_PATH.DS.'Tests'.DS.'cool'); + $w->setPath(ROOT_PATH.DS.'tests'.DS.'cool'); $this->assertEquals('tests\\cool\\CoolTest', $w->getName(true)); $w->writeClass(); - $this->assertEquals(ROOT_PATH.DS.'Tests'.DS.'cool'.DS.'CoolTest.php', $w->getAbsolutePath()); + $this->assertEquals(ROOT_PATH.DS.'tests'.DS.'cool'.DS.'CoolTest.php', $w->getAbsolutePath()); $this->assertTrue(file_exists($w->getAbsolutePath())); require_once $w->getAbsolutePath(); $this->assertTrue(class_exists('\\'.$w->getName(true))); From 0d7d9ae60883e4d75540de5745e34a33d38d041b Mon Sep 17 00:00:00 2001 From: Ibrahim BinAlshikh Date: Wed, 8 Oct 2025 17:15:34 +0300 Subject: [PATCH 24/45] refactor: Namespaces Correction --- .gitignore | 8 +- App/Init/InitMiddleware.php | 2 +- WebFiori/Framework/App.php | 6 +- WebFiori/Framework/Config/ClassDriver.php | 6 +- WebFiori/Framework/Config/JsonDriver.php | 6 +- .../Middleware/AbstractMiddleware.php | 2 +- .../Tests/Cli/CreateAPITestCaseTest.php | 26 ++-- tests/phpunit.xml | 108 ++++++++--------- tests/phpunit10.xml | 112 +++++++++--------- 9 files changed, 137 insertions(+), 139 deletions(-) diff --git a/.gitignore b/.gitignore index 4d3b6a20e..713406857 100644 --- a/.gitignore +++ b/.gitignore @@ -7,14 +7,12 @@ composer.lock *.cache cs-fixer.phar *.log -src/app/storage -app/storage /release/ php-cs-fixer-v2.phar -app/sto -app/config/* +App/sto +App/Config/* .idea/* -!/app/config/config-with-err-00.json +!/App/Config/config-with-err-00.json *.Identifier tests/clover.xml /.vscode diff --git a/App/Init/InitMiddleware.php b/App/Init/InitMiddleware.php index 7844ceb64..3f5ed59f4 100644 --- a/App/Init/InitMiddleware.php +++ b/App/Init/InitMiddleware.php @@ -4,7 +4,7 @@ class InitMiddleware { /** - * Register middleware which are created outside the folder '[APP_DIR]/middleware'. + * Register middleware which are created outside the folder '[APP_DIR]/Middleware'. * **/ public static function init() { diff --git a/WebFiori/Framework/App.php b/WebFiori/Framework/App.php index 350bdc84d..2ae349276 100644 --- a/WebFiori/Framework/App.php +++ b/WebFiori/Framework/App.php @@ -671,7 +671,7 @@ private function initMiddleware() { }); if (!class_exists(APP_DIR.'\Init\InitMiddleware')) { - Ini::get()->createIniClass('InitMiddleware', 'Register middleware which are created outside the folder \'[APP_DIR]/middleware\'.'); + Ini::get()->createIniClass('InitMiddleware', 'Register middleware which are created outside the folder \'[APP_DIR]/Middleware\'.'); } MiddlewareManager::register(new StartSessionMiddleware()); self::call(APP_DIR.'\Init\InitMiddleware::init'); @@ -683,10 +683,10 @@ private function initRoutes() { $routesClasses = ['APIsRoutes', 'PagesRoutes', 'ClosureRoutes', 'OtherRoutes']; foreach ($routesClasses as $className) { - if (!class_exists(APP_DIR.'\\Init\\routes\\'.$className)) { + if (!class_exists(APP_DIR.'\\Init\\Routes\\'.$className)) { Ini::get()->createRoutesClass($className); } - self::call(APP_DIR.'\Init\routes\\'.$className.'::create'); + self::call(APP_DIR.'\Init\Routes\\'.$className.'::create'); } if (Router::routesCount() != 0) { diff --git a/WebFiori/Framework/Config/ClassDriver.php b/WebFiori/Framework/Config/ClassDriver.php index bc3880708..3c4647836 100644 --- a/WebFiori/Framework/Config/ClassDriver.php +++ b/WebFiori/Framework/Config/ClassDriver.php @@ -12,14 +12,14 @@ * A configuration driver which is used to store configuration on PHP class. * * This driver will - * create a class called 'AppConfig' on the directory APP_DIR/config and + * create a class called 'AppConfig' on the directory APP_DIR/Config and * use it to read and write configurations. * * @author Ibrahim */ class ClassDriver implements ConfigurationDriver { - const CONFIG_FILE_PATH = APP_PATH.'config'.DIRECTORY_SEPARATOR.'AppConfig.php'; - const CONFIG_NS = APP_DIR.'\\config\\AppConfig'; + const CONFIG_FILE_PATH = APP_PATH.'Config'.DIRECTORY_SEPARATOR.'AppConfig.php'; + const CONFIG_NS = APP_DIR.'\\Config\\AppConfig'; const NL = "\n"; private $blockEnd; private $configVars; diff --git a/WebFiori/Framework/Config/JsonDriver.php b/WebFiori/Framework/Config/JsonDriver.php index 9d6701137..831a0594d 100644 --- a/WebFiori/Framework/Config/JsonDriver.php +++ b/WebFiori/Framework/Config/JsonDriver.php @@ -12,7 +12,7 @@ * Application configuration driver which is used to read and write application * configuration from JSON file. * - * The driver will create a JSON file in the path 'APP_PATH/config' with + * The driver will create a JSON file in the path 'APP_PATH/Config' with * the name 'app-config.json'. The developer can use the file to * modify application configuration. The name of the file can be changed as needed. * @@ -24,7 +24,7 @@ class JsonDriver implements ConfigurationDriver { * Returns the path to JSON configuration files. */ public static function getConfigPath(): string { - return APP_PATH.'config'.DIRECTORY_SEPARATOR; + return APP_PATH.'Config'.DIRECTORY_SEPARATOR; } /** * The name of JSON configuration file. @@ -597,7 +597,7 @@ public function setBaseURL(string $url) { /** * Sets the name of the file that configuration values will be taken from. * - * The file must exist on the directory [APP_PATH]/config/ . + * The file must exist on the directory [APP_PATH]/Config/ . * * @param string $name */ diff --git a/WebFiori/Framework/Middleware/AbstractMiddleware.php b/WebFiori/Framework/Middleware/AbstractMiddleware.php index 4a5d0b138..ef034b0cd 100644 --- a/WebFiori/Framework/Middleware/AbstractMiddleware.php +++ b/WebFiori/Framework/Middleware/AbstractMiddleware.php @@ -17,7 +17,7 @@ /** * An abstract class that can be used to implement custom middleware. * - * Every middleware the developer write must be placed in the folder 'app/middleware' + * Every middleware the developer write must be placed in the folder '[APP_DIR]/Middleware' * of the framework in order for the framework to auto-register the middleware. * If the middleware is placed in another place, then the developer must register * it manually using the method MiddlewareManager::register() before adding diff --git a/tests/WebFiori/Framework/Tests/Cli/CreateAPITestCaseTest.php b/tests/WebFiori/Framework/Tests/Cli/CreateAPITestCaseTest.php index 816a5c935..7897e888e 100644 --- a/tests/WebFiori/Framework/Tests/Cli/CreateAPITestCaseTest.php +++ b/tests/WebFiori/Framework/Tests/Cli/CreateAPITestCaseTest.php @@ -27,7 +27,7 @@ public function testCreateAPITestCase00() { * @test */ public function testCreateAPITestCase01() { - $path = ROOT_PATH.DS."tests".DS."WebFiori".DS."framework".DS."scheduler".DS."webServices"; + $path = ROOT_PATH.DS."tests".DS."WebFiori".DS."Framework".DS."Scheduler".DS."WebServices"; $this->assertEquals([ "Info: Selected services manager has no service with name 'c'.\n", "Which service you would like to have a test case for?\n", @@ -63,7 +63,7 @@ public function testCreateAPITestCase01() { * @test */ public function testCreateAPITestCase02() { - $path = ROOT_PATH.DS."tests".DS."WebFiori".DS."framework".DS."scheduler".DS."webServices"; + $path = ROOT_PATH.DS."tests".DS."WebFiori".DS."Framework".DS."Scheduler".DS."WebServices"; $this->assertEquals([ "Info: New class was created at \"".$path."\".\n" ], $this->executeMultiCommand([ @@ -84,7 +84,7 @@ public function testCreateAPITestCase02() { * @test */ public function testCreateAPITestCase03() { - $path = ROOT_PATH.DS."tests".DS."WebFiori".DS."framework".DS."scheduler".DS."webServices"; + $path = ROOT_PATH.DS."tests".DS."WebFiori".DS."Framework".DS."Scheduler".DS."WebServices"; $this->assertEquals([ "Please enter services manager information:\n", "Test case will be created with following parameters:\n", @@ -119,17 +119,17 @@ public function testCreateAPITestCase03() { * @test */ public function testCreateAPITestCase04() { - $path = ROOT_PATH.DS."tests".DS."tests".DS."Apis".DS."Multiple"; + $path = ROOT_PATH.DS."tests".DS."Apis".DS."Multiple"; $this->assertEquals([ "Please enter services manager information:\n", "Test case will be created with following parameters:\n", "PHPUnit Version: 9\n", - 'Name: tests\tests\Apis\Multiple\WebService00Test'."\n", + 'Name: tests\Apis\Multiple\WebService00Test'."\n", "Path: ".$path."\n", "Would you like to use default parameters?(Y/n)\n", "PHPUnit Version: Enter = '11'\n", "Enter a name for the new class:\n", - "Enter an optional namespace for the class: Enter = 'tests\\tests\Apis\Multiple'\n", + "Enter an optional namespace for the class: Enter = 'tests\Apis\Multiple'\n", "Info: New class was created at \"".$path."\".\n" ], $this->executeMultiCommand([ CreateCommand::class, @@ -144,7 +144,7 @@ public function testCreateAPITestCase04() { ])); $this->assertEquals(0, $this->getExitCode()); - $clazz = '\\tests\\tests\\Apis\\Multiple\\WebService00Test'; + $clazz = '\\tests\\Apis\\Multiple\\WebService00Test'; $this->assertTrue(file_exists($path.DS.'WebService00Test.php')); require_once $path.DS.'WebService00Test.php'; $this->assertTrue(class_exists($clazz)); @@ -168,19 +168,19 @@ public function testCreateAPITestCase05() { * @test */ public function testCreateAPITestCase06() { - $path = ROOT_PATH.DS."tests".DS."tests".DS."apis".DS."multiple"; + $path = ROOT_PATH.DS."tests".DS."apis".DS."multiple"; $this->assertEquals([ "Please enter services manager information:\n", "Error: Provided class is not an instance of ".WebServicesManager::class."\n", "Please enter services manager information:\n", "Test case will be created with following parameters:\n", "PHPUnit Version: 9\n", - 'Name: tests\tests\Apis\Multiple\WebService00Test'."\n", + 'Name: tests\Apis\Multiple\WebService00Test'."\n", "Path: ".$path."\n", "Would you like to use default parameters?(Y/n)\n", "PHPUnit Version: Enter = '11'\n", "Enter a name for the new class:\n", - "Enter an optional namespace for the class: Enter = 'tests\\tests\Apis\Multiple'\n", + "Enter an optional namespace for the class: Enter = 'tests\Apis\Multiple'\n", "Info: New class was created at \"".$path."\".\n" ], $this->executeMultiCommand([ CreateCommand::class, @@ -195,7 +195,7 @@ public function testCreateAPITestCase06() { '', ])); $this->assertEquals(0, $this->getExitCode()); - $clazz = '\\tests\\tests\\Apis\\Multiple\\WebService00Test'; + $clazz = '\\tests\\Apis\\Multiple\\WebService00Test'; $this->assertTrue(file_exists($path.DS.'WebService00Test.php')); require_once $path.DS.'WebService00Test.php'; $this->assertTrue(class_exists($clazz)); @@ -218,7 +218,7 @@ public function testCreateAPITestCase07() { * @test */ public function testCreateAPITestCase08() { - $path = ROOT_PATH.DS."tests".DS."tests".DS."Apis".DS."Multiple"; + $path = ROOT_PATH.DS."tests".DS."Apis".DS."Multiple"; $this->assertEquals([ "Info: New class was created at \"".$path."\".\n" ], $this->executeMultiCommand([ @@ -229,7 +229,7 @@ public function testCreateAPITestCase08() { '--defaults' ])); $this->assertEquals(0, $this->getExitCode()); - $clazz = '\\tests\\tests\\Apis\\Multiple\\WebService01Test'; + $clazz = '\\tests\\Apis\\Multiple\\WebService01Test'; $this->assertTrue(file_exists($path.DS.'WebService01Test.php')); require_once $path.DS.'WebService01Test.php'; $this->assertTrue(class_exists($clazz)); diff --git a/tests/phpunit.xml b/tests/phpunit.xml index c20d678c1..61b04087b 100644 --- a/tests/phpunit.xml +++ b/tests/phpunit.xml @@ -9,8 +9,8 @@ ../WebFiori/Framework/DB.php ../WebFiori/Framework/Language.php - ../WebFiori/Framework/config/JsonDriver.php - ../WebFiori/Framework/config/ClassDriver.php + ../WebFiori/Framework/Config/JsonDriver.php + ../WebFiori/Framework/Config/ClassDriver.php ../WebFiori/Framework/Privilege.php ../WebFiori/Framework/PrivilegesGroup.php @@ -20,67 +20,67 @@ ../WebFiori/Framework/ui/BeforeRenderCallback.php ../WebFiori/Framework/ui/WebPage.php - ../WebFiori/Framework/scheduler/BaseTask.php - ../WebFiori/Framework/scheduler/AbstractTask.php - ../WebFiori/Framework/scheduler/TasksManager.php - ../WebFiori/Framework/scheduler/TaskArgument.php + ../WebFiori/Framework/Scheduler/BaseTask.php + ../WebFiori/Framework/Scheduler/AbstractTask.php + ../WebFiori/Framework/Scheduler/TasksManager.php + ../WebFiori/Framework/Scheduler/TaskArgument.php - ../WebFiori/Framework/router/RouterUri.php - ../WebFiori/Framework/router/Router.php + ../WebFiori/Framework/Router/RouterUri.php + ../WebFiori/Framework/Router/Router.php - ../WebFiori/Framework/middleware/AbstractMiddleware.php - ../WebFiori/Framework/middleware/MiddlewareManager.php - ../WebFiori/Framework/middleware/CacheMiddleware.php - ../WebFiori/Framework/middleware/StartSessionMiddleware.php + ../WebFiori/Framework/Middleware/AbstractMiddleware.php + ../WebFiori/Framework/Middleware/MiddlewareManager.php + ../WebFiori/Framework/Middleware/CacheMiddleware.php + ../WebFiori/Framework/Middleware/StartSessionMiddleware.php - ../WebFiori/Framework/session/Session.php - ../WebFiori/Framework/session/SessionsManager.php - ../WebFiori/Framework/session/DefaultSessionStorage.php - ../WebFiori/Framework/session/DatabaseSessionStorage.php - ../WebFiori/Framework/session/SessionDB.php + ../WebFiori/Framework/Session/Session.php + ../WebFiori/Framework/Session/SessionsManager.php + ../WebFiori/Framework/Session/DefaultSessionStorage.php + ../WebFiori/Framework/Session/DatabaseSessionStorage.php + ../WebFiori/Framework/Session/SessionDB.php - ../WebFiori/Framework/cli/commands/AddCommand.php - ../WebFiori/Framework/cli/commands/CreateCommand.php - ../WebFiori/Framework/cli/commands/ListRoutesCommand.php - ../WebFiori/Framework/cli/commands/ListThemesCommand.php - ../WebFiori/Framework/cli/commands/RunSQLQueryCommand.php - ../WebFiori/Framework/cli/commands/SchedulerCommand.php - ../WebFiori/Framework/cli/commands/SettingsCommand.php - ../WebFiori/Framework/cli/commands/UpdateSettingsCommand.php - ../WebFiori/Framework/cli/commands/UpdateTableCommand.php - ../WebFiori/Framework/cli/commands/VersionCommand.php - ../WebFiori/Framework/cli/commands/WHelpCommand.php - ../WebFiori/Framework/cli/commands/RunMigrationsCommand.php + ../WebFiori/Framework/Cli/Commands/AddCommand.php + ../WebFiori/Framework/Cli/Commands/CreateCommand.php + ../WebFiori/Framework/Cli/Commands/ListRoutesCommand.php + ../WebFiori/Framework/Cli/Commands/ListThemesCommand.php + ../WebFiori/Framework/Cli/Commands/RunSQLQueryCommand.php + ../WebFiori/Framework/Cli/Commands/SchedulerCommand.php + ../WebFiori/Framework/Cli/Commands/SettingsCommand.php + ../WebFiori/Framework/Cli/Commands/UpdateSettingsCommand.php + ../WebFiori/Framework/Cli/Commands/UpdateTableCommand.php + ../WebFiori/Framework/Cli/Commands/VersionCommand.php + ../WebFiori/Framework/Cli/Commands/WHelpCommand.php + ../WebFiori/Framework/Cli/Commands/RunMigrationsCommand.php ../WebFiori/Framework/cli/CLITestCase.php ../WebFiori/Framework/cli/CLIUtils.php - ../WebFiori/Framework/cli/helpers/ClassInfoReader.php - ../WebFiori/Framework/cli/helpers/CreateBackgroundTask.php - ../WebFiori/Framework/cli/helpers/CreateCLIClassHelper.php - ../WebFiori/Framework/cli/helpers/CreateClassHelper.php - ../WebFiori/Framework/cli/helpers/CreateDBAccessHelper.php - ../WebFiori/Framework/cli/helpers/CreateFullRESTHelper.php - ../WebFiori/Framework/cli/helpers/CreateMiddleware.php - ../WebFiori/Framework/cli/helpers/CreateTableObj.php - ../WebFiori/Framework/cli/helpers/CreateThemeHelper.php - ../WebFiori/Framework/cli/helpers/CreateWebService.php - ../WebFiori/Framework/cli/helpers/TableObjHelper.php - ../WebFiori/Framework/cli/helpers/CreateAPITestCase.php - ../WebFiori/Framework/cli/helpers/CreateMigration.php + ../WebFiori/Framework/Cli/Helpers/ClassInfoReader.php + ../WebFiori/Framework/Cli/Helpers/CreateBackgroundTask.php + ../WebFiori/Framework/Cli/Helpers/CreateCLIClassHelper.php + ../WebFiori/Framework/Cli/Helpers/CreateClassHelper.php + ../WebFiori/Framework/Cli/Helpers/CreateDBAccessHelper.php + ../WebFiori/Framework/Cli/Helpers/CreateFullRESTHelper.php + ../WebFiori/Framework/Cli/Helpers/CreateMiddleware.php + ../WebFiori/Framework/Cli/Helpers/CreateTableObj.php + ../WebFiori/Framework/Cli/Helpers/CreateThemeHelper.php + ../WebFiori/Framework/Cli/Helpers/CreateWebService.php + ../WebFiori/Framework/Cli/Helpers/TableObjHelper.php + ../WebFiori/Framework/Cli/Helpers/CreateAPITestCase.php + ../WebFiori/Framework/Cli/Helpers/CreateMigration.php - ../WebFiori/Framework/writers/CLICommandClassWriter.php - ../WebFiori/Framework/writers/ClassWriter.php - ../WebFiori/Framework/writers/DBClassWriter.php - ../WebFiori/Framework/writers/LangClassWriter.php - ../WebFiori/Framework/writers/MiddlewareClassWriter.php - ../WebFiori/Framework/writers/SchedulerTaskClassWriter.php - ../WebFiori/Framework/writers/TableClassWriter.php - ../WebFiori/Framework/writers/ThemeClassWriter.php - ../WebFiori/Framework/writers/ThemeComponentWriter.php - ../WebFiori/Framework/writers/WebServiceWriter.php - ../WebFiori/Framework/writers/APITestCaseWriter.php - ../WebFiori/Framework/writers/DatabaseMigrationWriter.php + ../WebFiori/Framework/Writers/CLICommandClassWriter.php + ../WebFiori/Framework/Writers/ClassWriter.php + ../WebFiori/Framework/Writers/DBClassWriter.php + ../WebFiori/Framework/Writers/LangClassWriter.php + ../WebFiori/Framework/Writers/MiddlewareClassWriter.php + ../WebFiori/Framework/Writers/SchedulerTaskClassWriter.php + ../WebFiori/Framework/Writers/TableClassWriter.php + ../WebFiori/Framework/Writers/ThemeClassWriter.php + ../WebFiori/Framework/Writers/ThemeComponentWriter.php + ../WebFiori/Framework/Writers/WebServiceWriter.php + ../WebFiori/Framework/Writers/APITestCaseWriter.php + ../WebFiori/Framework/Writers/DatabaseMigrationWriter.php diff --git a/tests/phpunit10.xml b/tests/phpunit10.xml index 2860fdfcf..ff5539c00 100644 --- a/tests/phpunit10.xml +++ b/tests/phpunit10.xml @@ -53,68 +53,68 @@ ../WebFiori/Framework/Access.php ../WebFiori/Framework/DB.php ../WebFiori/Framework/Language.php - ../WebFiori/Framework/config/JsonDriver.php - ../WebFiori/Framework/config/ClassDriver.php + ../WebFiori/Framework/Config/JsonDriver.php + ../WebFiori/Framework/Config/ClassDriver.php ../WebFiori/Framework/Privilege.php ../WebFiori/Framework/PrivilegesGroup.php ../WebFiori/Framework/User.php ../WebFiori/Framework/Theme.php ../WebFiori/Framework/ui/BeforeRenderCallback.php ../WebFiori/Framework/ui/WebPage.php - ../WebFiori/Framework/scheduler/BaseTask.php - ../WebFiori/Framework/scheduler/AbstractTask.php - ../WebFiori/Framework/scheduler/TasksManager.php - ../WebFiori/Framework/scheduler/TaskArgument.php - ../WebFiori/Framework/router/RouterUri.php - ../WebFiori/Framework/router/Router.php - ../WebFiori/Framework/middleware/AbstractMiddleware.php - ../WebFiori/Framework/middleware/MiddlewareManager.php - ../WebFiori/Framework/middleware/CacheMiddleware.php - ../WebFiori/Framework/middleware/StartSessionMiddleware.php - ../WebFiori/Framework/session/Session.php - ../WebFiori/Framework/session/SessionsManager.php - ../WebFiori/Framework/session/DefaultSessionStorage.php - ../WebFiori/Framework/session/DatabaseSessionStorage.php - ../WebFiori/Framework/session/SessionDB.php - ../WebFiori/Framework/cli/commands/AddCommand.php - ../WebFiori/Framework/cli/commands/CreateCommand.php - ../WebFiori/Framework/cli/commands/ListRoutesCommand.php - ../WebFiori/Framework/cli/commands/ListThemesCommand.php - ../WebFiori/Framework/cli/commands/RunSQLQueryCommand.php - ../WebFiori/Framework/cli/commands/SchedulerCommand.php - ../WebFiori/Framework/cli/commands/SettingsCommand.php - ../WebFiori/Framework/cli/commands/UpdateSettingsCommand.php - ../WebFiori/Framework/cli/commands/UpdateTableCommand.php - ../WebFiori/Framework/cli/commands/VersionCommand.php - ../WebFiori/Framework/cli/commands/WHelpCommand.php - ../WebFiori/Framework/cli/commands/RunMigrationsCommand.php - ../WebFiori/Framework/cli/CLITestCase.php - ../WebFiori/Framework/cli/CLIUtils.php - ../WebFiori/Framework/cli/helpers/ClassInfoReader.php - ../WebFiori/Framework/cli/helpers/CreateBackgroundTask.php - ../WebFiori/Framework/cli/helpers/CreateCLIClassHelper.php - ../WebFiori/Framework/cli/helpers/CreateClassHelper.php - ../WebFiori/Framework/cli/helpers/CreateDBAccessHelper.php - ../WebFiori/Framework/cli/helpers/CreateFullRESTHelper.php - ../WebFiori/Framework/cli/helpers/CreateMiddleware.php - ../WebFiori/Framework/cli/helpers/CreateTableObj.php - ../WebFiori/Framework/cli/helpers/CreateThemeHelper.php - ../WebFiori/Framework/cli/helpers/CreateWebService.php - ../WebFiori/Framework/cli/helpers/TableObjHelper.php - ../WebFiori/Framework/cli/helpers/CreateAPITestCase.php - ../WebFiori/Framework/cli/helpers/CreateMigration.php - ../WebFiori/Framework/writers/CLICommandClassWriter.php - ../WebFiori/Framework/writers/ClassWriter.php - ../WebFiori/Framework/writers/DBClassWriter.php - ../WebFiori/Framework/writers/LangClassWriter.php - ../WebFiori/Framework/writers/MiddlewareClassWriter.php - ../WebFiori/Framework/writers/SchedulerTaskClassWriter.php - ../WebFiori/Framework/writers/TableClassWriter.php - ../WebFiori/Framework/writers/ThemeClassWriter.php - ../WebFiori/Framework/writers/ThemeComponentWriter.php - ../WebFiori/Framework/writers/WebServiceWriter.php - ../WebFiori/Framework/writers/APITestCaseWriter.php - ../WebFiori/Framework/writers/DatabaseMigrationWriter.php + ../WebFiori/Framework/Scheduler/BaseTask.php + ../WebFiori/Framework/Scheduler/AbstractTask.php + ../WebFiori/Framework/Scheduler/TasksManager.php + ../WebFiori/Framework/Scheduler/TaskArgument.php + ../WebFiori/Framework/Router/RouterUri.php + ../WebFiori/Framework/Router/Router.php + ../WebFiori/Framework/Middleware/AbstractMiddleware.php + ../WebFiori/Framework/Middleware/MiddlewareManager.php + ../WebFiori/Framework/Middleware/CacheMiddleware.php + ../WebFiori/Framework/Middleware/StartSessionMiddleware.php + ../WebFiori/Framework/Session/Session.php + ../WebFiori/Framework/Session/SessionsManager.php + ../WebFiori/Framework/Session/DefaultSessionStorage.php + ../WebFiori/Framework/Session/DatabaseSessionStorage.php + ../WebFiori/Framework/Session/SessionDB.php + ../WebFiori/Framework/Cli/Commands/AddCommand.php + ../WebFiori/Framework/Cli/Commands/CreateCommand.php + ../WebFiori/Framework/Cli/Commands/ListRoutesCommand.php + ../WebFiori/Framework/Cli/Commands/ListThemesCommand.php + ../WebFiori/Framework/Cli/Commands/RunSQLQueryCommand.php + ../WebFiori/Framework/Cli/Commands/SchedulerCommand.php + ../WebFiori/Framework/Cli/Commands/SettingsCommand.php + ../WebFiori/Framework/Cli/Commands/UpdateSettingsCommand.php + ../WebFiori/Framework/Cli/Commands/UpdateTableCommand.php + ../WebFiori/Framework/Cli/Commands/VersionCommand.php + ../WebFiori/Framework/Cli/Commands/WHelpCommand.php + ../WebFiori/Framework/Cli/Commands/RunMigrationsCommand.php + ../WebFiori/Framework/Cli/CLITestCase.php + ../WebFiori/Framework/Cli/CLIUtils.php + ../WebFiori/Framework/Cli/Helpers/ClassInfoReader.php + ../WebFiori/Framework/Cli/Helpers/CreateBackgroundTask.php + ../WebFiori/Framework/Cli/Helpers/CreateCLIClassHelper.php + ../WebFiori/Framework/Cli/Helpers/CreateClassHelper.php + ../WebFiori/Framework/Cli/Helpers/CreateDBAccessHelper.php + ../WebFiori/Framework/Cli/Helpers/CreateFullRESTHelper.php + ../WebFiori/Framework/Cli/Helpers/CreateMiddleware.php + ../WebFiori/Framework/Cli/Helpers/CreateTableObj.php + ../WebFiori/Framework/Cli/Helpers/CreateThemeHelper.php + ../WebFiori/Framework/Cli/Helpers/CreateWebService.php + ../WebFiori/Framework/Cli/Helpers/TableObjHelper.php + ../WebFiori/Framework/Cli/Helpers/CreateAPITestCase.php + ../WebFiori/Framework/Cli/Helpers/CreateMigration.php + ../WebFiori/Framework/Writers/CLICommandClassWriter.php + ../WebFiori/Framework/Writers/ClassWriter.php + ../WebFiori/Framework/Writers/DBClassWriter.php + ../WebFiori/Framework/Writers/LangClassWriter.php + ../WebFiori/Framework/Writers/MiddlewareClassWriter.php + ../WebFiori/Framework/Writers/SchedulerTaskClassWriter.php + ../WebFiori/Framework/Writers/TableClassWriter.php + ../WebFiori/Framework/Writers/ThemeClassWriter.php + ../WebFiori/Framework/Writers/ThemeComponentWriter.php + ../WebFiori/Framework/Writers/WebServiceWriter.php + ../WebFiori/Framework/Writers/APITestCaseWriter.php + ../WebFiori/Framework/Writers/DatabaseMigrationWriter.php From be05c5b6b9e5eaf81d60b3b609d5ea63fefe96ce Mon Sep 17 00:00:00 2001 From: Ibrahim BinAlshikh Date: Wed, 8 Oct 2025 17:26:33 +0300 Subject: [PATCH 25/45] test: Fix Test Cases --- .../Framework/Tests/Cli/CreateAPITestCaseTest.php | 2 +- .../WebFiori/Framework/Tests/Cli/CreateCLICommandTest.php | 4 ++-- tests/WebFiori/Framework/Tests/Cli/CreateDBAccessTest.php | 6 +++--- .../WebFiori/Framework/Tests/Cli/CreateMiddlewareTest.php | 4 ++-- .../WebFiori/Framework/Tests/Cli/CreateMigrationTest.php | 2 +- tests/WebFiori/Framework/Tests/Cli/CreateTableTest.php | 6 +++--- tests/WebFiori/Framework/Tests/Cli/CreateTaskTest.php | 8 ++++---- tests/WebFiori/Framework/Tests/Cli/CreateThemeTest.php | 8 ++++---- .../WebFiori/Framework/Tests/Cli/CreateWebServiceTest.php | 6 +++--- 9 files changed, 23 insertions(+), 23 deletions(-) diff --git a/tests/WebFiori/Framework/Tests/Cli/CreateAPITestCaseTest.php b/tests/WebFiori/Framework/Tests/Cli/CreateAPITestCaseTest.php index 7897e888e..03021cee5 100644 --- a/tests/WebFiori/Framework/Tests/Cli/CreateAPITestCaseTest.php +++ b/tests/WebFiori/Framework/Tests/Cli/CreateAPITestCaseTest.php @@ -168,7 +168,7 @@ public function testCreateAPITestCase05() { * @test */ public function testCreateAPITestCase06() { - $path = ROOT_PATH.DS."tests".DS."apis".DS."multiple"; + $path = ROOT_PATH.DS."tests".DS."Apis".DS."Multiple"; $this->assertEquals([ "Please enter services manager information:\n", "Error: Provided class is not an instance of ".WebServicesManager::class."\n", diff --git a/tests/WebFiori/Framework/Tests/Cli/CreateCLICommandTest.php b/tests/WebFiori/Framework/Tests/Cli/CreateCLICommandTest.php index 14180d78f..8257947b3 100644 --- a/tests/WebFiori/Framework/Tests/Cli/CreateCLICommandTest.php +++ b/tests/WebFiori/Framework/Tests/Cli/CreateCLICommandTest.php @@ -46,7 +46,7 @@ public function testCreateCommand00() { "Enter a name for the command:\n", "Give a short description of the command:\n", "Would you like to add arguments to the command?(y/N)\n", - 'Info: New class was created at "'.ROOT_PATH.DS.'App'.DS."commands\".\n", + 'Info: New class was created at "'.ROOT_PATH.DS.'App'.DS."Commands\".\n", ], $output); $this->assertTrue(class_exists('\\App\\Commands\\NewCLICommand')); $this->removeClass('\\App\\Commands\\NewCLICommand'); @@ -105,7 +105,7 @@ public function testCreateCommand01() { "Is this argument optional or not?(Y/n)\n", "Enter default value:\n", "Would you like to add more arguments?(y/N)\n", - 'Info: New class was created at "'.ROOT_PATH.DS.'App'.DS."commands\".\n", + 'Info: New class was created at "'.ROOT_PATH.DS.'App'.DS."Commands\".\n", ], $output); $this->assertTrue(class_exists($clazz)); diff --git a/tests/WebFiori/Framework/Tests/Cli/CreateDBAccessTest.php b/tests/WebFiori/Framework/Tests/Cli/CreateDBAccessTest.php index b0421c70f..8f21908aa 100644 --- a/tests/WebFiori/Framework/Tests/Cli/CreateDBAccessTest.php +++ b/tests/WebFiori/Framework/Tests/Cli/CreateDBAccessTest.php @@ -42,7 +42,7 @@ public function test00() { "Entity class name:\n", "Entity namespace: Enter = 'App\\Entity'\n", "Would you like to have update methods for every single column?(y/N)\n", - "Info: New class was created at \"". ROOT_PATH.DS."app".DS."database\".\n" + "Info: New class was created at \"". ROOT_PATH.DS."App".DS."Database\".\n" ], $output); $clazz = '\\App\\Database\\EmployeeOperationsDB'; $this->assertTrue(class_exists($clazz)); @@ -77,7 +77,7 @@ public function test01() { "Entity class name:\n", "Entity namespace: Enter = 'App\\Entity'\n", "Would you like to have update methods for every single column?(y/N)\n", - "Info: New class was created at \"". ROOT_PATH.DS."app".DS."database".DS."empl\".\n" + "Info: New class was created at \"". ROOT_PATH.DS."App".DS."Database".DS."Empl\".\n" ], $output); $clazz = '\\App\\Database\\Empl\\EmployeeSDB'; $this->assertTrue(class_exists($clazz)); @@ -120,7 +120,7 @@ public function test02() { "Entity class name:\n", "Entity namespace: Enter = 'App\\Entity'\n", "Would you like to have update methods for every single column?(y/N)\n", - "Info: New class was created at \"". ROOT_PATH.DS."app".DS."database\".\n" + "Info: New class was created at \"". ROOT_PATH.DS."App".DS."Database\".\n" ], $output); $clazz = '\\App\\Database\\Position2xDB'; $this->assertTrue(class_exists($clazz)); diff --git a/tests/WebFiori/Framework/Tests/Cli/CreateMiddlewareTest.php b/tests/WebFiori/Framework/Tests/Cli/CreateMiddlewareTest.php index 3bec6c1e8..cde392827 100644 --- a/tests/WebFiori/Framework/Tests/Cli/CreateMiddlewareTest.php +++ b/tests/WebFiori/Framework/Tests/Cli/CreateMiddlewareTest.php @@ -48,7 +48,7 @@ public function testCreateMiddleware00() { "Enter a name for the middleware:\n", "Enter middleware priority: Enter = '0'\n", "Would you like to add the middleware to a group?(y/N)\n", - 'Info: New class was created at "'.ROOT_PATH.DS.'App'.DS."middleware\".\n", + 'Info: New class was created at "'.ROOT_PATH.DS.'App'.DS."Middleware\".\n", ], $output); $this->assertTrue(class_exists('\\App\\Middleware\\NewCoolMdMiddleware')); $this->removeClass('\\App\\Middleware\\NewCoolMdMiddleware'); @@ -84,7 +84,7 @@ public function testCreateMiddleware01() { "Would you like to add the middleware to a group?(y/N)\n", "Enter group name:\n", "Would you like to add the middleware to another group?(y/N)\n", - 'Info: New class was created at "'.ROOT_PATH.DS.'App'.DS."middleware\".\n", + 'Info: New class was created at "'.ROOT_PATH.DS.'App'.DS."Middleware\".\n", ], $output); $clazz = '\\App\\Middleware\\NewCoolMiddleware'; diff --git a/tests/WebFiori/Framework/Tests/Cli/CreateMigrationTest.php b/tests/WebFiori/Framework/Tests/Cli/CreateMigrationTest.php index 6546590e5..81676ce48 100644 --- a/tests/WebFiori/Framework/Tests/Cli/CreateMigrationTest.php +++ b/tests/WebFiori/Framework/Tests/Cli/CreateMigrationTest.php @@ -41,7 +41,7 @@ public function testCreateMigration01() { $this->assertEquals([ "Migration namespace: Enter = 'App\Database\Migrations'\n", "Provide a name for the class that will have migration logic:\n", - 'Info: New class was created at "'. APP_PATH .'Database'.DS.'migrations".'."\n", + 'Info: New class was created at "'. APP_PATH .'Database'.DS.'Migrations".'."\n", ], $this->executeMultiCommand([ CreateCommand::class, '--c' => 'migration', diff --git a/tests/WebFiori/Framework/Tests/Cli/CreateTableTest.php b/tests/WebFiori/Framework/Tests/Cli/CreateTableTest.php index ad8447b23..0f7d4a28d 100644 --- a/tests/WebFiori/Framework/Tests/Cli/CreateTableTest.php +++ b/tests/WebFiori/Framework/Tests/Cli/CreateTableTest.php @@ -120,7 +120,7 @@ public function testCreateTable00() { "Would you like to add another column?(y/N)\n", "Would you like to add foreign keys to the table?(y/N)\n", "Would you like to create an entity class that maps to the database table?(y/N)\n", - 'Info: New class was created at "'.ROOT_PATH.DS.'App'.DS."database\".\n", + 'Info: New class was created at "'.ROOT_PATH.DS.'App'.DS."Database\".\n", ]), $output); } @@ -184,7 +184,7 @@ public function testCreateTable01() { "Would you like to add another column?(y/N)\n", "Would you like to add foreign keys to the table?(y/N)\n", "Would you like to create an entity class that maps to the database table?(y/N)\n", - 'Info: New class was created at "'.ROOT_PATH.DS.'App'.DS."database\".\n", + 'Info: New class was created at "'.ROOT_PATH.DS.'App'.DS."Database\".\n", ]), $output); } @@ -272,7 +272,7 @@ public function testCreateTable02() { "Would you like to add another column?(y/N)\n", "Would you like to add foreign keys to the table?(y/N)\n", "Would you like to create an entity class that maps to the database table?(y/N)\n", - 'Info: New class was created at "'.ROOT_PATH.DS.'App'.DS."database\".\n", + 'Info: New class was created at "'.ROOT_PATH.DS.'App'.DS."Database\".\n", ]), $output); } diff --git a/tests/WebFiori/Framework/Tests/Cli/CreateTaskTest.php b/tests/WebFiori/Framework/Tests/Cli/CreateTaskTest.php index 053d463f7..d09f79541 100644 --- a/tests/WebFiori/Framework/Tests/Cli/CreateTaskTest.php +++ b/tests/WebFiori/Framework/Tests/Cli/CreateTaskTest.php @@ -49,7 +49,7 @@ public function test00() { "Enter a name for the task:\n", "Provide short description of what does the task will do:\n", "Would you like to add arguments to the task?(y/N)\n", - "Info: New class was created at \"".ROOT_PATH.DS.'App'.DS."tasks\".\n", + "Info: New class was created at \"".ROOT_PATH.DS.'App'.DS."Tasks\".\n", ], $output); $clazz = '\\App\\Tasks\\SuperCoolTask'; $this->assertTrue(class_exists($clazz)); @@ -98,7 +98,7 @@ public function test01() { "Enter a name for the task:\n", "Provide short description of what does the task will do:\n", "Would you like to add arguments to the task?(y/N)\n", - "Info: New class was created at \"".ROOT_PATH.DS.'App'.DS."tasks\".\n", + "Info: New class was created at \"".ROOT_PATH.DS.'App'.DS."Tasks\".\n", ], $output); $clazz = '\\App\\Tasks\\SuperCool2Task'; $this->assertTrue(class_exists($clazz)); @@ -152,7 +152,7 @@ public function test02() { "Error: Invalid input is given. Try again.\n", "Provide short description of what does the task will do:\n", "Would you like to add arguments to the task?(y/N)\n", - "Info: New class was created at \"".ROOT_PATH.DS.'App'.DS."tasks\".\n", + "Info: New class was created at \"".ROOT_PATH.DS.'App'.DS."Tasks\".\n", ], $output); $clazz = '\\App\\Tasks\\NewRoundTask'; $this->assertTrue(class_exists($clazz)); @@ -208,7 +208,7 @@ public function test03() { "Enter argument name:\n", "Error: Invalid argument name: \n", "Would you like to add more arguments?(y/N)\n", - "Info: New class was created at \"".ROOT_PATH.DS.'App'.DS."tasks\".\n", + "Info: New class was created at \"".ROOT_PATH.DS.'App'.DS."Tasks\".\n", ], $output); $clazz = '\\App\\Tasks\\SendDailyReportTask'; $this->assertTrue(class_exists($clazz)); diff --git a/tests/WebFiori/Framework/Tests/Cli/CreateThemeTest.php b/tests/WebFiori/Framework/Tests/Cli/CreateThemeTest.php index d8325b7be..de6f17223 100644 --- a/tests/WebFiori/Framework/Tests/Cli/CreateThemeTest.php +++ b/tests/WebFiori/Framework/Tests/Cli/CreateThemeTest.php @@ -42,8 +42,8 @@ public function testCreateTheme00() { "11: Quit. <--\n", "Enter a name for the new class:\n", "Enter an optional namespace for the class: Enter = 'Themes'\n", - 'Creating theme at "'.ROOT_PATH.DS.'Themes'.DS."fiori\"...\n", - 'Info: New class was created at "'.ROOT_PATH.DS.'Themes'.DS."fiori\".\n", + 'Creating theme at "'.ROOT_PATH.DS.'Themes'.DS."Fiori\"...\n", + 'Info: New class was created at "'.ROOT_PATH.DS.'Themes'.DS."Fiori\".\n", ], $output); $this->assertTrue(class_exists('\\Themes\\Fiori\\NewTestTheme')); @@ -98,8 +98,8 @@ public function testCreateThemeWithExistingName() { "Error: A class in the given namespace which has the given name was found.\n", "Enter a name for the new class:\n", "Enter an optional namespace for the class: Enter = 'Themes'\n", - 'Creating theme at "'.ROOT_PATH.DS.'Themes'.DS."cool\"...\n", - 'Info: New class was created at "'.ROOT_PATH.DS.'Themes'.DS."cool\".\n", + 'Creating theme at "'.ROOT_PATH.DS.'Themes'.DS."Cool\"...\n", + 'Info: New class was created at "'.ROOT_PATH.DS.'Themes'.DS."Cool\".\n", ], $output); $this->assertEquals(0, $this->getExitCode()); $this->removeClass($ns2.'\\'.$name2); diff --git a/tests/WebFiori/Framework/Tests/Cli/CreateWebServiceTest.php b/tests/WebFiori/Framework/Tests/Cli/CreateWebServiceTest.php index 42ed696ea..8c7f5d941 100644 --- a/tests/WebFiori/Framework/Tests/Cli/CreateWebServiceTest.php +++ b/tests/WebFiori/Framework/Tests/Cli/CreateWebServiceTest.php @@ -87,7 +87,7 @@ public function test00() { "Success: New parameter added.\n", "Would you like to add another parameter?(y/N)\n", "Creating the class...\n", - 'Info: New class was created at "'.ROOT_PATH.DS.'App'.DS."apis\".\n", + 'Info: New class was created at "'.ROOT_PATH.DS.'App'.DS."Apis\".\n", "Info: Don't forget to add the service to a services manager.\n", ], $output); @@ -186,7 +186,7 @@ public function test01() { "Success: New parameter added.\n", "Would you like to add another parameter?(y/N)\n", "Creating the class...\n", - 'Info: New class was created at "'.ROOT_PATH.DS.'App'.DS."apis\".\n", + 'Info: New class was created at "'.ROOT_PATH.DS.'App'.DS."Apis\".\n", "Info: Don't forget to add the service to a services manager.\n", ], $output); @@ -285,7 +285,7 @@ public function test02() { "Success: New parameter added.\n", "Would you like to add another parameter?(y/N)\n", "Creating the class...\n", - 'Info: New class was created at "'.ROOT_PATH.DS.'App'.DS."apis\".\n", + 'Info: New class was created at "'.ROOT_PATH.DS.'App'.DS."Apis\".\n", "Info: Don't forget to add the service to a services manager.\n", ], $output); From e6635400ae0605a933b3447f5c98f48987e8edb8 Mon Sep 17 00:00:00 2001 From: Ibrahim BinAlshikh Date: Wed, 8 Oct 2025 17:38:27 +0300 Subject: [PATCH 26/45] Update DatabaseMigrationWriterTest.php --- .../Writers/DatabaseMigrationWriterTest.php | 38 +++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/tests/WebFiori/Framework/Tests/Writers/DatabaseMigrationWriterTest.php b/tests/WebFiori/Framework/Tests/Writers/DatabaseMigrationWriterTest.php index 82ea557b5..dc833bfc7 100644 --- a/tests/WebFiori/Framework/Tests/Writers/DatabaseMigrationWriterTest.php +++ b/tests/WebFiori/Framework/Tests/Writers/DatabaseMigrationWriterTest.php @@ -14,7 +14,7 @@ class DatabaseMigrationWriterTest extends TestCase { protected function tearDown(): void { // Clean up only the Migration files created by this test (Migration000, Migration001, etc.) - $migrationsDir = APP_PATH . DS . 'Database' . DS . 'migrations'; + $migrationsDir = APP_PATH . DS . 'Database' . DS . 'Migrations'; if (is_dir($migrationsDir)) { // Only remove Migration files directly in the migrations directory, not in subdirectories $files = glob($migrationsDir . DS . 'Migration[0-9][0-9][0-9].php'); @@ -31,14 +31,14 @@ protected function tearDown(): void { */ public function test00() { DatabaseMigrationWriter::resetCounter(); - $path = APP_PATH.DS.'Database'.DS.'migrations'; - $ns = '\\App\\Database\\migrations'; - $clazz = "\\App\\Database\\migrations\\Migration000"; + $path = APP_PATH.DS.'Database'.DS.'Migrations'; + $ns = '\\App\\Database\\Migrations'; + $clazz = "\\App\\Database\\Migrations\\Migration000"; $this->removeClass($clazz); $runner = new SchemaRunner(null); $writter = new DatabaseMigrationWriter($runner); $this->assertEquals('Migration000', $writter->getName()); - $this->assertEquals('App\\Database\\migrations', $writter->getNamespace()); + $this->assertEquals('App\\Database\\Migrations', $writter->getNamespace()); $this->assertEquals('', $writter->getSuffix()); $this->assertEquals([ "WebFiori\Database\Database", @@ -53,7 +53,7 @@ public function test00() { $this->assertEquals(1, count($migrations)); $m00 = $migrations[0]; $this->assertTrue($m00 instanceof AbstractMigration); - $this->assertEquals('App\\Database\\migrations\\Migration000', $m00->getName()); + $this->assertEquals('App\\Database\\Migrations\\Migration000', $m00->getName()); $this->removeClass($clazz); $runner = new SchemaRunner(null); } @@ -63,8 +63,8 @@ public function test00() { public function test01() { DatabaseMigrationWriter::resetCounter(); $runner = new SchemaRunner(null); - $path = APP_PATH.DS.'Database'.DS.'migrations'; - $ns = '\\App\\Database\\migrations'; + $path = APP_PATH.DS.'Database'.DS.'Migrations'; + $ns = '\\App\\Database\\Migrations'; $writter = new DatabaseMigrationWriter($runner); $writter->setClassName('MyMigration'); $this->assertEquals('MyMigration', $writter->getName()); @@ -79,7 +79,7 @@ public function test01() { $this->assertEquals(1, count($migrations)); $m00 = $migrations[0]; $this->assertTrue($m00 instanceof AbstractMigration); - $this->assertEquals('App\\Database\\migrations\\MyMigration', $m00->getName()); + $this->assertEquals('App\\Database\\Migrations\\MyMigration', $m00->getName()); $this->removeClass($clazz); $runner = new SchemaRunner(null); } @@ -89,8 +89,8 @@ public function test01() { public function test02() { DatabaseMigrationWriter::resetCounter(); $runner = new SchemaRunner(null); - $path = APP_PATH.DS.'Database'.DS.'migrations'; - $ns = '\\App\\Database\\migrations'; + $path = APP_PATH.DS.'Database'.DS.'Migrations'; + $ns = '\\App\\Database\\Migrations'; $writter = new DatabaseMigrationWriter($runner); $this->assertEquals('Migration000', $writter->getName()); $writter->writeClass(); @@ -104,12 +104,12 @@ public function test02() { $this->assertEquals(1, count($migrations)); $m00 = $migrations[0]; $this->assertTrue($m00 instanceof AbstractMigration); - $this->assertEquals('App\\Database\\migrations\\Migration000', $m00->getName()); + $this->assertEquals('App\\Database\\Migrations\\Migration000', $m00->getName()); $writter2 = new DatabaseMigrationWriter($runner2); $this->assertEquals('Migration001', $writter2->getName()); $writter2->writeClass(); - $clazz2 = "\\App\\Database\\migrations\\Migration001"; + $clazz2 = "\\App\\Database\\Migrations\\Migration001"; $this->assertTrue(class_exists($clazz)); $runner->register($clazz); $allClasses[] = $clazz; @@ -120,7 +120,7 @@ public function test02() { $this->assertEquals(2, count($migrations2)); $m01 = $migrations2[1]; $this->assertTrue($m00 instanceof AbstractMigration); - $this->assertEquals('App\\Database\\migrations\\Migration001', $m01->getName()); + $this->assertEquals('App\\Database\\Migrations\\Migration001', $m01->getName()); $this->removeClass($clazz); $runner = new SchemaRunner(null); $this->removeClass($clazz2); @@ -131,8 +131,8 @@ public function test02() { public function test03() { DatabaseMigrationWriter::resetCounter(); $runner = new SchemaRunner(null); - $path = APP_PATH.DS.'Database'.DS.'migrations'; - $ns = '\\App\\Database\\migrations'; + $path = APP_PATH.DS.'Database'.DS.'Migrations'; + $ns = '\\App\\Database\\Migrations'; $allClasses = []; for ($x = 0 ; $x < 110 ; $x++) { $writter = new DatabaseMigrationWriter($runner); @@ -145,7 +145,7 @@ public function test03() { } $this->assertEquals($name, $writter->getName()); $writter->writeClass(); - $clazz = "\\App\\Database\\migrations\\".$name; + $clazz = "\\App\\Database\\Migrations\\".$name; $this->assertTrue(class_exists($clazz)); $runner->register($clazz); $allClasses[] = $clazz; @@ -158,10 +158,10 @@ public function test03() { $this->assertEquals($x + 1, count($migrations)); $m = $migrations[$x]; $this->assertTrue($m instanceof AbstractMigration); - $this->assertEquals("App\\Database\\migrations\\" . $name, $m->getName()); + $this->assertEquals("App\\Database\\Migrations\\" . $name, $m->getName()); } foreach ($migrations as $m) { - $this->removeClass("\\App\\Database\\migrations\\".$m->getName()); + $this->removeClass("\\App\\Database\\Migrations\\".$m->getName()); } } private function removeClass($classPath) { From 6f9568bfbc4453dde3b0ad30b8f5356718e9931c Mon Sep 17 00:00:00 2001 From: Ibrahim BinAlshikh Date: Wed, 8 Oct 2025 17:38:45 +0300 Subject: [PATCH 27/45] Update CreateCommand.php --- WebFiori/Framework/Cli/Commands/CreateCommand.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WebFiori/Framework/Cli/Commands/CreateCommand.php b/WebFiori/Framework/Cli/Commands/CreateCommand.php index 8de5eeaa2..718a7ac2d 100644 --- a/WebFiori/Framework/Cli/Commands/CreateCommand.php +++ b/WebFiori/Framework/Cli/Commands/CreateCommand.php @@ -138,7 +138,7 @@ private function getWhat() { $options['api-test'] = 'Web service test case.'; $options['migration'] = 'Database migration.'; $options['q'] = 'Quit.'; - $what = $this->getArgValue('--c'); + $what = strtolower($this->getArgValue('--c')); $answer = null; if ($what !== null) { From e51d354a2be0843f55e70ced529c45341988ba2e Mon Sep 17 00:00:00 2001 From: Ibrahim BinAlshikh Date: Wed, 8 Oct 2025 18:50:14 +0300 Subject: [PATCH 28/45] fix: Namespaces --- WebFiori/Framework/Autoload/ClassLoader.php | 2 +- WebFiori/Framework/Cli/Commands/CreateCommand.php | 2 +- .../Framework/Tests/Cli/CreateDBAccessTest.php | 4 ++-- .../Framework/Tests/Cli/CreateEntityTest.php | 2 +- .../Framework/Tests/Cli/DBClassWritterTest.php | 14 +++++++------- .../Tests/Writers/DatabaseMigrationWriterTest.php | 6 +++--- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/WebFiori/Framework/Autoload/ClassLoader.php b/WebFiori/Framework/Autoload/ClassLoader.php index 61add8bea..34715a4a3 100644 --- a/WebFiori/Framework/Autoload/ClassLoader.php +++ b/WebFiori/Framework/Autoload/ClassLoader.php @@ -257,7 +257,7 @@ public static function get(array $options = [ } } $defineRoot = isset($options['define-root']) && $options['define-root'] === true; - $root = isset($options['root']) ? trim($options['root'],'\\/') : trim(substr(__DIR__, 0, strlen(__DIR__) - strlen('\entity')),'\\/'); + $root = isset($options['root']) ? trim($options['root'],'\\/') : trim(substr(__DIR__, 0, strlen(__DIR__) - strlen('\Entity')),'\\/'); if (strlen($root) != 0 && explode($DS, $root)[0] == 'home') { //linux diff --git a/WebFiori/Framework/Cli/Commands/CreateCommand.php b/WebFiori/Framework/Cli/Commands/CreateCommand.php index 718a7ac2d..d346c6c21 100644 --- a/WebFiori/Framework/Cli/Commands/CreateCommand.php +++ b/WebFiori/Framework/Cli/Commands/CreateCommand.php @@ -44,7 +44,7 @@ public function __construct() { } public function createEntityFromQuery(): int { $tableObj = CLIUtils::readTable($this); - $defaultNs = APP_DIR.'\\entity'; + $defaultNs = APP_DIR.'\\Entity'; $this->println('We need from you to give us entity class information.'); $infoReader = new ClassInfoReader($this); $classInfo = $infoReader->readClassInfo($defaultNs); diff --git a/tests/WebFiori/Framework/Tests/Cli/CreateDBAccessTest.php b/tests/WebFiori/Framework/Tests/Cli/CreateDBAccessTest.php index 8f21908aa..646a76b5e 100644 --- a/tests/WebFiori/Framework/Tests/Cli/CreateDBAccessTest.php +++ b/tests/WebFiori/Framework/Tests/Cli/CreateDBAccessTest.php @@ -25,9 +25,9 @@ public function test00() { ], [ 'Tables\\EmployeeInfoTable', 'EmployeeOperations', - "\n", // Hit Enter to pick default value (App\database) + "\n", // Hit Enter to pick default value (App\Database) 'SuperUser', - "\n", // Hit Enter to pick default value (App\entity) + "\n", // Hit Enter to pick default value (App\Entity) 'n' ]); diff --git a/tests/WebFiori/Framework/Tests/Cli/CreateEntityTest.php b/tests/WebFiori/Framework/Tests/Cli/CreateEntityTest.php index d03c12545..625099f03 100644 --- a/tests/WebFiori/Framework/Tests/Cli/CreateEntityTest.php +++ b/tests/WebFiori/Framework/Tests/Cli/CreateEntityTest.php @@ -17,7 +17,7 @@ public function testCreateEntity00() { '--table' => TestTable::class ], [ 'NeEntity', - "\n", // Hit Enter to pick default value (app\entity) + "\n", // Hit Enter to pick default value (App\Entity) 'y', 'y', 'superNewAttr', diff --git a/tests/WebFiori/Framework/Tests/Cli/DBClassWritterTest.php b/tests/WebFiori/Framework/Tests/Cli/DBClassWritterTest.php index f065feb56..bb70aff07 100644 --- a/tests/WebFiori/Framework/Tests/Cli/DBClassWritterTest.php +++ b/tests/WebFiori/Framework/Tests/Cli/DBClassWritterTest.php @@ -20,8 +20,8 @@ public function test00() { $table = new UserInfoTable(); $mapper = $table->getEntityMapper(); $mapper->setEntityName('CoolUser'); - $mapper->setNamespace('WebFiori\\entity'); - $writter = new DBClassWriter('UserDBClass', 'WebFiori\\db', $table); + $mapper->setNamespace('WebFiori\\Entity'); + $writter = new DBClassWriter('UserDBClass', 'WebFiori\\Db', $table); $writter->writeClass(); $this->assertTrue(class_exists($writter->getName(true))); $this->removeClass($writter->getName(true)); @@ -34,8 +34,8 @@ public function test01() { $table = new EmployeeInfoTable(); $mapper = $table->getEntityMapper(); $mapper->setEntityName('Employee'); - $mapper->setNamespace('WebFiori\\entity'); - $writter = new DBClassWriter('EmployeeDB', 'WebFiori\\db', $table); + $mapper->setNamespace('WebFiori\\Entity'); + $writter = new DBClassWriter('EmployeeDB', 'WebFiori\\Db', $table); $writter->writeClass(); $this->assertTrue(class_exists($writter->getName(true))); $this->removeClass($writter->getName(true)); @@ -48,8 +48,8 @@ public function test02() { $table = new PositionInfoTable(); $mapper = $table->getEntityMapper(); $mapper->setEntityName('Position'); - $mapper->setNamespace('WebFiori\\entity'); - $writter = new DBClassWriter('PositionDB', 'WebFiori\\db', $table); + $mapper->setNamespace('WebFiori\\Entity'); + $writter = new DBClassWriter('PositionDB', 'WebFiori\\Db', $table); $writter->writeClass(); $this->assertTrue(class_exists($writter->getName(true))); $this->removeClass($writter->getName(true)); @@ -60,7 +60,7 @@ public function test02() { */ public function test03() { $table = new PositionInfoTable(); - $writter = new DBClassWriter('PositionDB2', 'WebFiori\\db', $table); + $writter = new DBClassWriter('PositionDB2', 'WebFiori\\Db', $table); $writter->setConnection(' '); $this->assertNull($writter->getConnectionName()); $writter->setConnection('ok-connection'); diff --git a/tests/WebFiori/Framework/Tests/Writers/DatabaseMigrationWriterTest.php b/tests/WebFiori/Framework/Tests/Writers/DatabaseMigrationWriterTest.php index dc833bfc7..06195e917 100644 --- a/tests/WebFiori/Framework/Tests/Writers/DatabaseMigrationWriterTest.php +++ b/tests/WebFiori/Framework/Tests/Writers/DatabaseMigrationWriterTest.php @@ -68,10 +68,10 @@ public function test01() { $writter = new DatabaseMigrationWriter($runner); $writter->setClassName('MyMigration'); $this->assertEquals('MyMigration', $writter->getName()); - $this->assertEquals('App\\Database\\migrations', $writter->getNamespace()); + $this->assertEquals('App\\Database\\Migrations', $writter->getNamespace()); $writter->writeClass(); - $clazz = "\\App\\Database\\migrations\\MyMigration"; + $clazz = "\\App\\Database\\Migrations\\MyMigration"; $this->assertTrue(class_exists($clazz)); $runner->register($clazz); $allClasses[] = $clazz; @@ -94,7 +94,7 @@ public function test02() { $writter = new DatabaseMigrationWriter($runner); $this->assertEquals('Migration000', $writter->getName()); $writter->writeClass(); - $clazz = "\\App\\Database\\migrations\\Migration000"; + $clazz = "\\App\\Database\\Migrations\\Migration000"; $this->assertTrue(class_exists($clazz)); $runner->register($clazz); $allClasses[] = $clazz; From 0732cd09b158a15ec792e0fe595fac131bc836d8 Mon Sep 17 00:00:00 2001 From: Ibrahim BinAlshikh Date: Wed, 8 Oct 2025 18:54:54 +0300 Subject: [PATCH 29/45] test: Correcting Namespaces --- .../EmptyService/EmptyServicesManager.php | 2 +- tests/Apis/Multiple/ServicesManager00.php | 2 +- tests/Apis/Multiple/WebService00.php | 2 +- tests/Apis/Multiple/WebService01.php | 2 +- .../Tests/Cli/CreateAPITestCaseTest.php | 22 +++++++++---------- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/tests/Apis/EmptyService/EmptyServicesManager.php b/tests/Apis/EmptyService/EmptyServicesManager.php index fbe232001..aba06f4cc 100644 --- a/tests/Apis/EmptyService/EmptyServicesManager.php +++ b/tests/Apis/EmptyService/EmptyServicesManager.php @@ -1,5 +1,5 @@ assertEquals(0, $this->getExitCode()); - $clazz = '\\tests\WebFiori\\Framework\Scheduler\WebServices\\TasksLoginServiceTest'; + $clazz = '\\WebFiori\\Framework\Scheduler\WebServices\\TasksLoginServiceTest'; $this->assertTrue(file_exists($path.DS.'TasksLoginServiceTest.php')); require_once $path.DS.'TasksLoginServiceTest.php'; $this->assertTrue(class_exists($clazz)); @@ -74,7 +74,7 @@ public function testCreateAPITestCase02() { '--defaults' ])); $this->assertEquals(0, $this->getExitCode()); - $clazz = '\\tests\WebFiori\\Framework\Scheduler\WebServices\\GetTasksServiceTest'; + $clazz = '\\WebFiori\\Framework\Scheduler\WebServices\\GetTasksServiceTest'; $this->assertTrue(file_exists($path.DS.'GetTasksServiceTest.php')); require_once $path.DS.'GetTasksServiceTest.php'; $this->assertTrue(class_exists($clazz)); @@ -109,7 +109,7 @@ public function testCreateAPITestCase03() { ])); $this->assertEquals(0, $this->getExitCode()); - $clazz = '\\tests\WebFiori\\Framework\Scheduler\WebServices\\GetTasksServiceTest'; + $clazz = '\\WebFiori\\Framework\Scheduler\WebServices\\GetTasksServiceTest'; $this->assertTrue(file_exists($path.DS.'GetTasksServiceTest.php')); require_once $path.DS.'GetTasksServiceTest.php'; $this->assertTrue(class_exists($clazz)); @@ -136,7 +136,7 @@ public function testCreateAPITestCase04() { '--c' => 'api-test', '--service' => 'say-hi-service', ], [ - '\\tests\\Apis\\Multiple\\ServicesManager00', + '\\Apis\\Multiple\\ServicesManager00', 'n', '10', '', @@ -144,7 +144,7 @@ public function testCreateAPITestCase04() { ])); $this->assertEquals(0, $this->getExitCode()); - $clazz = '\\tests\\Apis\\Multiple\\WebService00Test'; + $clazz = '\\Apis\\Multiple\\WebService00Test'; $this->assertTrue(file_exists($path.DS.'WebService00Test.php')); require_once $path.DS.'WebService00Test.php'; $this->assertTrue(class_exists($clazz)); @@ -160,7 +160,7 @@ public function testCreateAPITestCase05() { ], $this->executeMultiCommand([ CreateCommand::class, '--c' => 'api-test', - '--manager' => '\\tests\\Apis\\EmptyService\\EmptyServicesManager', + '--manager' => '\\Apis\\EmptyService\\EmptyServicesManager', ])); $this->assertEquals(-1, $this->getExitCode()); } @@ -187,15 +187,15 @@ public function testCreateAPITestCase06() { '--c' => 'api-test', '--service' => 'say-hi-service', ], [ - '\\tests\\Apis\\Multiple\\WebService00', - '\\tests\\Apis\\Multiple\\ServicesManager00', + '\\Apis\\Multiple\\WebService00', + '\\Apis\\Multiple\\ServicesManager00', 'n', '10', '', '', ])); $this->assertEquals(0, $this->getExitCode()); - $clazz = '\\tests\\Apis\\Multiple\\WebService00Test'; + $clazz = '\\Apis\\Multiple\\WebService00Test'; $this->assertTrue(file_exists($path.DS.'WebService00Test.php')); require_once $path.DS.'WebService00Test.php'; $this->assertTrue(class_exists($clazz)); @@ -210,7 +210,7 @@ public function testCreateAPITestCase07() { ], $this->executeMultiCommand([ CreateCommand::class, '--c' => 'api-test', - '--manager' => '\\tests\\Apis\\EmptyService\\Xyz', + '--manager' => '\\Apis\\EmptyService\\Xyz', ])); $this->assertEquals(-1, $this->getExitCode()); } @@ -225,7 +225,7 @@ public function testCreateAPITestCase08() { CreateCommand::class, '--c' => 'api-test', '--service' => 'say-hi-service-2', - '--manager' => '\\tests\\Apis\\Multiple\\ServicesManager00', + '--manager' => '\\Apis\\Multiple\\ServicesManager00', '--defaults' ])); $this->assertEquals(0, $this->getExitCode()); From 7a29c475d79802346579c9ca0e079cf07bfbe1a7 Mon Sep 17 00:00:00 2001 From: Ibrahim BinAlshikh Date: Wed, 8 Oct 2025 19:24:47 +0300 Subject: [PATCH 30/45] Update CreateAPITestCaseTest.php --- .../Framework/Tests/Cli/CreateAPITestCaseTest.php | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/tests/WebFiori/Framework/Tests/Cli/CreateAPITestCaseTest.php b/tests/WebFiori/Framework/Tests/Cli/CreateAPITestCaseTest.php index fa2c56cf4..84e31cb76 100644 --- a/tests/WebFiori/Framework/Tests/Cli/CreateAPITestCaseTest.php +++ b/tests/WebFiori/Framework/Tests/Cli/CreateAPITestCaseTest.php @@ -27,7 +27,7 @@ public function testCreateAPITestCase00() { * @test */ public function testCreateAPITestCase01() { - $path = ROOT_PATH.DS."tests".DS."WebFiori".DS."Framework".DS."Scheduler".DS."WebServices"; + $path = ROOT_PATH.DS.'tests'.DS."WebFiori".DS."Framework".DS."Scheduler".DS."WebServices"; $this->assertEquals([ "Info: Selected services manager has no service with name 'c'.\n", "Which service you would like to have a test case for?\n", @@ -38,7 +38,7 @@ public function testCreateAPITestCase01() { "4: set-password\n", "Test case will be created with following parameters:\n", "PHPUnit Version: 9\n", - 'Name: tests\WebFiori\\Framework\Scheduler\WebServices\\TasksLoginServiceTest'."\n", + 'Name: WebFiori\\Framework\Scheduler\WebServices\\TasksLoginServiceTest'."\n", "Path: ".$path."\n", "Would you like to use default parameters?(Y/n)\n", "Info: New class was created at \"".$path."\".\n" @@ -85,16 +85,17 @@ public function testCreateAPITestCase02() { */ public function testCreateAPITestCase03() { $path = ROOT_PATH.DS."tests".DS."WebFiori".DS."Framework".DS."Scheduler".DS."WebServices"; + $name = 'GetTasksServiceTest'; $this->assertEquals([ "Please enter services manager information:\n", "Test case will be created with following parameters:\n", "PHPUnit Version: 9\n", - 'Name: tests\WebFiori\\Framework\Scheduler\WebServices\\GetTasksServiceTest'."\n", + 'Name: WebFiori\\Framework\Scheduler\WebServices\\'.$name."\n", "Path: ".$path."\n", "Would you like to use default parameters?(Y/n)\n", "PHPUnit Version: Enter = '11'\n", "Enter a name for the new class:\n", - "Enter an optional namespace for the class: Enter = 'tests\WebFiori\\Framework\Scheduler\WebServices'\n", + "Enter an optional namespace for the class: Enter = 'WebFiori\\Framework\Scheduler\WebServices'\n", "Info: New class was created at \"".$path."\".\n" ], $this->executeMultiCommand([ CreateCommand::class, @@ -113,7 +114,7 @@ public function testCreateAPITestCase03() { $this->assertTrue(file_exists($path.DS.'GetTasksServiceTest.php')); require_once $path.DS.'GetTasksServiceTest.php'; $this->assertTrue(class_exists($clazz)); - $this->removeClass($clazz); + $this->removeClass($path.DS.$name); } /** * @test From 42f0909fe69507e4d7678bf89ce3651c8a5f3671 Mon Sep 17 00:00:00 2001 From: Ibrahim BinAlshikh Date: Wed, 8 Oct 2025 19:25:08 +0300 Subject: [PATCH 31/45] Update CreateAPITestCase.php --- WebFiori/Framework/Cli/Helpers/CreateAPITestCase.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/WebFiori/Framework/Cli/Helpers/CreateAPITestCase.php b/WebFiori/Framework/Cli/Helpers/CreateAPITestCase.php index 64bc40721..6a8d10742 100644 --- a/WebFiori/Framework/Cli/Helpers/CreateAPITestCase.php +++ b/WebFiori/Framework/Cli/Helpers/CreateAPITestCase.php @@ -44,7 +44,7 @@ public function readClassInfo() { array_pop($nsArr); $ns = implode('\\', $nsArr); $this->setClassName($this->writer->getServiceName().'Test'); - $this->setNamespace('tests\\'.$ns); + $this->setNamespace($ns); $this->setPath(ROOT_PATH.DS.'tests'.DS.implode(DS, $nsArr)); @@ -67,7 +67,8 @@ private function checkPlace($ns) { $this->writeClass(); } else { $this->writer->setPhpUnitVersion($this->getCommand()->readInteger('PHPUnit Version:', 11)); - $this->setClassInfo('tests\\'.$ns, 'Test'); + $this->setClassInfo($ns, 'Test'); + $this->setPath(ROOT_PATH.DS.'tests'.DS.$this->writer->getNamespace()); $this->writeClass(); } } From 7b62798afbb5f7a18295599ab28d4b54b8285f41 Mon Sep 17 00:00:00 2001 From: Ibrahim BinAlshikh Date: Thu, 9 Oct 2025 11:59:30 +0300 Subject: [PATCH 32/45] Update CreateAPITestCaseTest.php --- .../Tests/Cli/CreateAPITestCaseTest.php | 35 ++++++++++--------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/tests/WebFiori/Framework/Tests/Cli/CreateAPITestCaseTest.php b/tests/WebFiori/Framework/Tests/Cli/CreateAPITestCaseTest.php index 84e31cb76..2f3874e45 100644 --- a/tests/WebFiori/Framework/Tests/Cli/CreateAPITestCaseTest.php +++ b/tests/WebFiori/Framework/Tests/Cli/CreateAPITestCaseTest.php @@ -121,16 +121,17 @@ public function testCreateAPITestCase03() { */ public function testCreateAPITestCase04() { $path = ROOT_PATH.DS."tests".DS."Apis".DS."Multiple"; + $name = 'WebService00Test'; $this->assertEquals([ "Please enter services manager information:\n", "Test case will be created with following parameters:\n", "PHPUnit Version: 9\n", - 'Name: tests\Apis\Multiple\WebService00Test'."\n", + 'Name: Apis\Multiple\\'.$name."\n", "Path: ".$path."\n", "Would you like to use default parameters?(Y/n)\n", "PHPUnit Version: Enter = '11'\n", "Enter a name for the new class:\n", - "Enter an optional namespace for the class: Enter = 'tests\Apis\Multiple'\n", + "Enter an optional namespace for the class: Enter = 'Apis\Multiple'\n", "Info: New class was created at \"".$path."\".\n" ], $this->executeMultiCommand([ CreateCommand::class, @@ -145,11 +146,11 @@ public function testCreateAPITestCase04() { ])); $this->assertEquals(0, $this->getExitCode()); - $clazz = '\\Apis\\Multiple\\WebService00Test'; - $this->assertTrue(file_exists($path.DS.'WebService00Test.php')); - require_once $path.DS.'WebService00Test.php'; + $clazz = '\\Apis\\Multiple\\'.$name; + $this->assertTrue(file_exists($path.DS.$name.'.php')); + require_once $path.DS.$name.'.php'; $this->assertTrue(class_exists($clazz)); - $this->removeClass($clazz); + $this->removeClass($path.DS.$name); } /** @@ -170,18 +171,19 @@ public function testCreateAPITestCase05() { */ public function testCreateAPITestCase06() { $path = ROOT_PATH.DS."tests".DS."Apis".DS."Multiple"; + $name = 'WebService00Test'; $this->assertEquals([ "Please enter services manager information:\n", "Error: Provided class is not an instance of ".WebServicesManager::class."\n", "Please enter services manager information:\n", "Test case will be created with following parameters:\n", "PHPUnit Version: 9\n", - 'Name: tests\Apis\Multiple\WebService00Test'."\n", + 'Name: Apis\Multiple\\'.$name."\n", "Path: ".$path."\n", "Would you like to use default parameters?(Y/n)\n", "PHPUnit Version: Enter = '11'\n", "Enter a name for the new class:\n", - "Enter an optional namespace for the class: Enter = 'tests\Apis\Multiple'\n", + "Enter an optional namespace for the class: Enter = 'Apis\Multiple'\n", "Info: New class was created at \"".$path."\".\n" ], $this->executeMultiCommand([ CreateCommand::class, @@ -196,11 +198,11 @@ public function testCreateAPITestCase06() { '', ])); $this->assertEquals(0, $this->getExitCode()); - $clazz = '\\Apis\\Multiple\\WebService00Test'; + $clazz = '\\Apis\\Multiple\\'.$name; $this->assertTrue(file_exists($path.DS.'WebService00Test.php')); - require_once $path.DS.'WebService00Test.php'; + require_once $path.DS.$name.'.php'; $this->assertTrue(class_exists($clazz)); - $this->removeClass($clazz); + $this->removeClass($path.DS.$name); } /** * @test @@ -211,7 +213,7 @@ public function testCreateAPITestCase07() { ], $this->executeMultiCommand([ CreateCommand::class, '--c' => 'api-test', - '--manager' => '\\Apis\\EmptyService\\Xyz', + '--manager' => '\\tests\\Apis\\EmptyService\\Xyz', ])); $this->assertEquals(-1, $this->getExitCode()); } @@ -230,10 +232,11 @@ public function testCreateAPITestCase08() { '--defaults' ])); $this->assertEquals(0, $this->getExitCode()); - $clazz = '\\tests\\Apis\\Multiple\\WebService01Test'; - $this->assertTrue(file_exists($path.DS.'WebService01Test.php')); - require_once $path.DS.'WebService01Test.php'; + $name = 'WebService01Test'; + $clazz = '\\Apis\\Multiple\\'.$name; + $this->assertTrue(file_exists($path.DS.$name.'.php')); + require_once $path.DS.$name.'.php'; $this->assertTrue(class_exists($clazz)); - $this->removeClass($clazz); + $this->removeClass($path.DS.$name); } } From c01e10cc5e50b056548aa6eee02bfd5e0bd1e960 Mon Sep 17 00:00:00 2001 From: Ibrahim BinAlshikh Date: Thu, 9 Oct 2025 12:19:19 +0300 Subject: [PATCH 33/45] Update DatabaseMigrationWriter.php --- WebFiori/Framework/Writers/DatabaseMigrationWriter.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WebFiori/Framework/Writers/DatabaseMigrationWriter.php b/WebFiori/Framework/Writers/DatabaseMigrationWriter.php index 28d833adf..355952ee8 100644 --- a/WebFiori/Framework/Writers/DatabaseMigrationWriter.php +++ b/WebFiori/Framework/Writers/DatabaseMigrationWriter.php @@ -35,7 +35,7 @@ public function __construct(?SchemaRunner $runner) { $this->setClassName($name); - parent::__construct($name, APP_PATH.'Database'.DS.'migrations', APP_DIR.'\\Database\\migrations'); + parent::__construct($name, APP_PATH.'Database'.DS.'Migrations', APP_DIR.'\\Database\\Migrations'); $this->addUseStatement([ Database::class, AbstractMigration::class, From 713dd660deab266f5b7ccc1a7d6d85048a15f397 Mon Sep 17 00:00:00 2001 From: Ibrahim BinAlshikh Date: Thu, 9 Oct 2025 12:32:50 +0300 Subject: [PATCH 34/45] Update CreateDBAccessTest.php --- tests/WebFiori/Framework/Tests/Cli/CreateDBAccessTest.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/WebFiori/Framework/Tests/Cli/CreateDBAccessTest.php b/tests/WebFiori/Framework/Tests/Cli/CreateDBAccessTest.php index 646a76b5e..65a4d38e2 100644 --- a/tests/WebFiori/Framework/Tests/Cli/CreateDBAccessTest.php +++ b/tests/WebFiori/Framework/Tests/Cli/CreateDBAccessTest.php @@ -60,9 +60,9 @@ public function test01() { ], [ 'Tables\\EmployeeInfoTable', 'EmployeeS', - 'App\\Database\\Empl', + "\n", 'SuperHero', - 'App\\Entity\\Subs', + "\n", 'y' ]); @@ -77,9 +77,9 @@ public function test01() { "Entity class name:\n", "Entity namespace: Enter = 'App\\Entity'\n", "Would you like to have update methods for every single column?(y/N)\n", - "Info: New class was created at \"". ROOT_PATH.DS."App".DS."Database".DS."Empl\".\n" + "Info: New class was created at \"". ROOT_PATH.DS."App".DS."Database\".\n" ], $output); - $clazz = '\\App\\Database\\Empl\\EmployeeSDB'; + $clazz = '\\App\\Database\\EmployeeSDB'; $this->assertTrue(class_exists($clazz)); $this->removeClass($clazz); } From a148a8be6ae75793f5a27e115a5295168dffaf40 Mon Sep 17 00:00:00 2001 From: Ibrahim BinAlshikh Date: Thu, 9 Oct 2025 12:33:01 +0300 Subject: [PATCH 35/45] Update CreateMigrationTest.php --- tests/WebFiori/Framework/Tests/Cli/CreateMigrationTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/WebFiori/Framework/Tests/Cli/CreateMigrationTest.php b/tests/WebFiori/Framework/Tests/Cli/CreateMigrationTest.php index 81676ce48..f94386bc7 100644 --- a/tests/WebFiori/Framework/Tests/Cli/CreateMigrationTest.php +++ b/tests/WebFiori/Framework/Tests/Cli/CreateMigrationTest.php @@ -39,7 +39,7 @@ public function testCreateMigration01() { $clazz = '\\App\\Database\\Migrations\\'.$name; $this->assertEquals([ - "Migration namespace: Enter = 'App\Database\Migrations'\n", + "Migration namespace: Enter = 'App\Database\migrations'\n", "Provide a name for the class that will have migration logic:\n", 'Info: New class was created at "'. APP_PATH .'Database'.DS.'Migrations".'."\n", ], $this->executeMultiCommand([ From 620bfbdc1c3bb220886ced744367bac415c03a47 Mon Sep 17 00:00:00 2001 From: Ibrahim BinAlshikh Date: Thu, 9 Oct 2025 12:33:20 +0300 Subject: [PATCH 36/45] Update CreateCommand.php --- WebFiori/Framework/Cli/Commands/CreateCommand.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/WebFiori/Framework/Cli/Commands/CreateCommand.php b/WebFiori/Framework/Cli/Commands/CreateCommand.php index d346c6c21..bc5c2d3d6 100644 --- a/WebFiori/Framework/Cli/Commands/CreateCommand.php +++ b/WebFiori/Framework/Cli/Commands/CreateCommand.php @@ -138,11 +138,11 @@ private function getWhat() { $options['api-test'] = 'Web service test case.'; $options['migration'] = 'Database migration.'; $options['q'] = 'Quit.'; - $what = strtolower($this->getArgValue('--c')); + $what = $this->getArgValue('--c'); $answer = null; if ($what !== null) { - $answer = $options[$what] ?? null; + $answer = $options[strtolower($what)] ?? null; if ($answer === null) { $this->warning('The argument --c has invalid value.'); From 4cdb822c076ec4e1e95e9503699d5057b053b6e2 Mon Sep 17 00:00:00 2001 From: Ibrahim BinAlshikh Date: Thu, 9 Oct 2025 12:45:03 +0300 Subject: [PATCH 37/45] Update CreateThemeTest.php --- .../Framework/Tests/Cli/CreateThemeTest.php | 28 ++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/tests/WebFiori/Framework/Tests/Cli/CreateThemeTest.php b/tests/WebFiori/Framework/Tests/Cli/CreateThemeTest.php index de6f17223..30c682b1e 100644 --- a/tests/WebFiori/Framework/Tests/Cli/CreateThemeTest.php +++ b/tests/WebFiori/Framework/Tests/Cli/CreateThemeTest.php @@ -12,7 +12,33 @@ * @author Ibrahim */ class CreateThemeTest extends CLITestCase { - /** + + protected function tearDown(): void { + // Clean up theme assets from public directory + $assetsPath = ROOT_PATH . DS . PUBLIC_FOLDER . DS . 'assets'; + if (is_dir($assetsPath)) { + $themeDirs = ['FioriTheme', 'FioriTheme2', 'Cool']; + foreach ($themeDirs as $themeDir) { + $themePath = $assetsPath . DS . $themeDir; + if (is_dir($themePath)) { + $this->removeDirectory($themePath); + } + } + } + parent::tearDown(); + } + + private function removeDirectory($dir) { + if (!is_dir($dir)) { + return; + } + $files = array_diff(scandir($dir), ['.', '..']); + foreach ($files as $file) { + $path = $dir . DS . $file; + is_dir($path) ? $this->removeDirectory($path) : unlink($path); + } + rmdir($dir); + } /** * @test */ public function testCreateTheme00() { From 8c7402342723c1e6498fdd3d0a3a3d7f2aa7762a Mon Sep 17 00:00:00 2001 From: Ibrahim BinAlshikh Date: Thu, 9 Oct 2025 12:45:19 +0300 Subject: [PATCH 38/45] Update ThemeTest.php --- .../Framework/Tests/Theme/ThemeTest.php | 28 ++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/tests/WebFiori/Framework/Tests/Theme/ThemeTest.php b/tests/WebFiori/Framework/Tests/Theme/ThemeTest.php index 4783a7338..d6b12b88d 100644 --- a/tests/WebFiori/Framework/Tests/Theme/ThemeTest.php +++ b/tests/WebFiori/Framework/Tests/Theme/ThemeTest.php @@ -14,7 +14,33 @@ * @author Ibrahim */ class ThemeTest extends TestCase { - public function testAvailableThemes00() { + + protected function tearDown(): void { + // Clean up theme assets from public directory + $assetsPath = ROOT_PATH . DS . PUBLIC_FOLDER . DS . 'assets'; + if (is_dir($assetsPath)) { + $themeDirs = ['FioriTheme', 'FioriTheme2']; + foreach ($themeDirs as $themeDir) { + $themePath = $assetsPath . DS . $themeDir; + if (is_dir($themePath)) { + $this->removeDirectory($themePath); + } + } + } + parent::tearDown(); + } + + private function removeDirectory($dir) { + if (!is_dir($dir)) { + return; + } + $files = array_diff(scandir($dir), ['.', '..']); + foreach ($files as $file) { + $path = $dir . DS . $file; + is_dir($path) ? $this->removeDirectory($path) : unlink($path); + } + rmdir($dir); + } public function testAvailableThemes00() { $themes = ThemeManager::getRegisteredThemes(); $this->assertEquals(2, count($themes)); } From 6a03b801f8f18f46cd0405a5073a589dcaab720e Mon Sep 17 00:00:00 2001 From: Ibrahim BinAlshikh Date: Thu, 9 Oct 2025 12:58:00 +0300 Subject: [PATCH 39/45] Update CreateAPITestCaseTest.php --- .../Framework/Tests/Cli/CreateAPITestCaseTest.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/WebFiori/Framework/Tests/Cli/CreateAPITestCaseTest.php b/tests/WebFiori/Framework/Tests/Cli/CreateAPITestCaseTest.php index 2f3874e45..cae0f8241 100644 --- a/tests/WebFiori/Framework/Tests/Cli/CreateAPITestCaseTest.php +++ b/tests/WebFiori/Framework/Tests/Cli/CreateAPITestCaseTest.php @@ -57,7 +57,7 @@ public function testCreateAPITestCase01() { $this->assertTrue(file_exists($path.DS.'TasksLoginServiceTest.php')); require_once $path.DS.'TasksLoginServiceTest.php'; $this->assertTrue(class_exists($clazz)); - $this->removeClass($clazz); + $this->removeClass('tests\\WebFiori\\Framework\\Scheduler\\WebServices\\TasksLoginServiceTest'); } /** * @test @@ -78,7 +78,7 @@ public function testCreateAPITestCase02() { $this->assertTrue(file_exists($path.DS.'GetTasksServiceTest.php')); require_once $path.DS.'GetTasksServiceTest.php'; $this->assertTrue(class_exists($clazz)); - $this->removeClass($clazz); + $this->removeClass('tests\\WebFiori\\Framework\\Scheduler\\WebServices\\GetTasksServiceTest'); } /** * @test @@ -114,7 +114,7 @@ public function testCreateAPITestCase03() { $this->assertTrue(file_exists($path.DS.'GetTasksServiceTest.php')); require_once $path.DS.'GetTasksServiceTest.php'; $this->assertTrue(class_exists($clazz)); - $this->removeClass($path.DS.$name); + $this->removeClass('tests\\WebFiori\\Framework\\Scheduler\\WebServices\\GetTasksServiceTest'); } /** * @test @@ -150,7 +150,7 @@ public function testCreateAPITestCase04() { $this->assertTrue(file_exists($path.DS.$name.'.php')); require_once $path.DS.$name.'.php'; $this->assertTrue(class_exists($clazz)); - $this->removeClass($path.DS.$name); + $this->removeClass('tests\\Apis\\Multiple\\'.$name); } /** @@ -202,7 +202,7 @@ public function testCreateAPITestCase06() { $this->assertTrue(file_exists($path.DS.'WebService00Test.php')); require_once $path.DS.$name.'.php'; $this->assertTrue(class_exists($clazz)); - $this->removeClass($path.DS.$name); + $this->removeClass('tests\\Apis\\Multiple\\'.$name); } /** * @test @@ -237,6 +237,6 @@ public function testCreateAPITestCase08() { $this->assertTrue(file_exists($path.DS.$name.'.php')); require_once $path.DS.$name.'.php'; $this->assertTrue(class_exists($clazz)); - $this->removeClass($path.DS.$name); + $this->removeClass('tests\\Apis\\Multiple\\'.$name); } } From 2fcb0c5993d7eb47c270d8113f58a2cf13f76046 Mon Sep 17 00:00:00 2001 From: Ibrahim BinAlshikh Date: Thu, 9 Oct 2025 13:46:32 +0300 Subject: [PATCH 40/45] fix: Writing Classes --- .../Framework/Tests/Cli/CreateMigrationTest.php | 9 +++++++++ .../Framework/Tests/Cli/DBClassWritterTest.php | 14 ++++++++++++++ .../Tests/Writers/DatabaseMigrationWriterTest.php | 9 +++++++++ 3 files changed, 32 insertions(+) diff --git a/tests/WebFiori/Framework/Tests/Cli/CreateMigrationTest.php b/tests/WebFiori/Framework/Tests/Cli/CreateMigrationTest.php index f94386bc7..c38ad604e 100644 --- a/tests/WebFiori/Framework/Tests/Cli/CreateMigrationTest.php +++ b/tests/WebFiori/Framework/Tests/Cli/CreateMigrationTest.php @@ -9,6 +9,15 @@ */ class CreateMigrationTest extends CLITestCase { + protected function setUp(): void { + parent::setUp(); + // Ensure migrations directory exists + $migrationsDir = APP_PATH . DS . 'Database' . DS . 'Migrations'; + if (!is_dir($migrationsDir)) { + mkdir($migrationsDir, 0755, true); + } + } + protected function tearDown(): void { // Clean up only specific migration files created by this test $migrationsDir = APP_PATH . DS . 'Database' . DS . 'Migrations'; diff --git a/tests/WebFiori/Framework/Tests/Cli/DBClassWritterTest.php b/tests/WebFiori/Framework/Tests/Cli/DBClassWritterTest.php index bb70aff07..60fcf8179 100644 --- a/tests/WebFiori/Framework/Tests/Cli/DBClassWritterTest.php +++ b/tests/WebFiori/Framework/Tests/Cli/DBClassWritterTest.php @@ -13,6 +13,20 @@ * @author Ibrahim */ class DBClassWritterTest extends CLITestCase { + + protected function setUp(): void { + parent::setUp(); + // Ensure directories exist for DB classes + $dirs = [ + ROOT_PATH . DS . 'WebFiori' . DS . 'Db', + ROOT_PATH . DS . 'WebFiori' . DS . 'Entity' + ]; + foreach ($dirs as $dir) { + if (!is_dir($dir)) { + mkdir($dir, 0755, true); + } + } + } /** * @test */ diff --git a/tests/WebFiori/Framework/Tests/Writers/DatabaseMigrationWriterTest.php b/tests/WebFiori/Framework/Tests/Writers/DatabaseMigrationWriterTest.php index 06195e917..7888d77cd 100644 --- a/tests/WebFiori/Framework/Tests/Writers/DatabaseMigrationWriterTest.php +++ b/tests/WebFiori/Framework/Tests/Writers/DatabaseMigrationWriterTest.php @@ -12,6 +12,15 @@ */ class DatabaseMigrationWriterTest extends TestCase { + protected function setUp(): void { + parent::setUp(); + // Ensure migrations directory exists + $migrationsDir = APP_PATH . DS . 'Database' . DS . 'Migrations'; + if (!is_dir($migrationsDir)) { + mkdir($migrationsDir, 0755, true); + } + } + protected function tearDown(): void { // Clean up only the Migration files created by this test (Migration000, Migration001, etc.) $migrationsDir = APP_PATH . DS . 'Database' . DS . 'Migrations'; From c59fac072dd9c41861f1effa4ed76137e4906241 Mon Sep 17 00:00:00 2001 From: Ibrahim BinAlshikh Date: Thu, 9 Oct 2025 14:18:48 +0300 Subject: [PATCH 41/45] test: Added Check for Files --- .../Tests/Cli/DBClassWritterTest.php | 20 +++++++++++++++++++ .../Writers/DatabaseMigrationWriterTest.php | 4 ++++ 2 files changed, 24 insertions(+) diff --git a/tests/WebFiori/Framework/Tests/Cli/DBClassWritterTest.php b/tests/WebFiori/Framework/Tests/Cli/DBClassWritterTest.php index 60fcf8179..f34ade04b 100644 --- a/tests/WebFiori/Framework/Tests/Cli/DBClassWritterTest.php +++ b/tests/WebFiori/Framework/Tests/Cli/DBClassWritterTest.php @@ -37,6 +37,11 @@ public function test00() { $mapper->setNamespace('WebFiori\\Entity'); $writter = new DBClassWriter('UserDBClass', 'WebFiori\\Db', $table); $writter->writeClass(); + + // Check if file was written and require it + $filePath = $writter->getPath() . DS . $writter->getName() . '.php'; + $this->assertTrue(file_exists($filePath), "Class file was not created: $filePath"); + require_once $filePath; $this->assertTrue(class_exists($writter->getName(true))); $this->removeClass($writter->getName(true)); } @@ -51,6 +56,11 @@ public function test01() { $mapper->setNamespace('WebFiori\\Entity'); $writter = new DBClassWriter('EmployeeDB', 'WebFiori\\Db', $table); $writter->writeClass(); + + // Check if file was written and require it + $filePath = $writter->getPath() . DS . $writter->getName() . '.php'; + $this->assertTrue(file_exists($filePath), "Class file was not created: $filePath"); + require_once $filePath; $this->assertTrue(class_exists($writter->getName(true))); $this->removeClass($writter->getName(true)); } @@ -65,6 +75,11 @@ public function test02() { $mapper->setNamespace('WebFiori\\Entity'); $writter = new DBClassWriter('PositionDB', 'WebFiori\\Db', $table); $writter->writeClass(); + + // Check if file was written and require it + $filePath = $writter->getPath() . DS . $writter->getName() . '.php'; + $this->assertTrue(file_exists($filePath), "Class file was not created: $filePath"); + require_once $filePath; $this->assertTrue(class_exists($writter->getName(true))); $this->removeClass($writter->getName(true)); } @@ -81,6 +96,11 @@ public function test03() { $this->assertEquals('ok-connection', $writter->getConnectionName()); $writter->includeColumnsUpdate(); $writter->writeClass(); + + // Check if file was written and require it + $filePath = $writter->getPath() . DS . $writter->getName() . '.php'; + $this->assertTrue(file_exists($filePath), "Class file was not created: $filePath"); + require_once $filePath; $this->assertTrue(class_exists($writter->getName(true))); $this->removeClass($writter->getName(true)); } diff --git a/tests/WebFiori/Framework/Tests/Writers/DatabaseMigrationWriterTest.php b/tests/WebFiori/Framework/Tests/Writers/DatabaseMigrationWriterTest.php index 7888d77cd..819c157ca 100644 --- a/tests/WebFiori/Framework/Tests/Writers/DatabaseMigrationWriterTest.php +++ b/tests/WebFiori/Framework/Tests/Writers/DatabaseMigrationWriterTest.php @@ -55,6 +55,10 @@ public function test00() { ], $writter->getUseStatements()); $writter->writeClass(); + // Check if file was written and require it + $filePath = $writter->getPath() . DS . $writter->getName() . '.php'; + $this->assertTrue(file_exists($filePath), "Class file was not created: $filePath"); + require_once $filePath; $this->assertTrue(class_exists($clazz)); $runner->register($clazz); $allClasses[] = $clazz; From 13da8b02b1da3ae969d8402132027364695f57e8 Mon Sep 17 00:00:00 2001 From: Ibrahim BinAlshikh Date: Thu, 9 Oct 2025 14:28:59 +0300 Subject: [PATCH 42/45] Update CreateMigrationTest.php --- tests/WebFiori/Framework/Tests/Cli/CreateMigrationTest.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/WebFiori/Framework/Tests/Cli/CreateMigrationTest.php b/tests/WebFiori/Framework/Tests/Cli/CreateMigrationTest.php index c38ad604e..7dff77f2d 100644 --- a/tests/WebFiori/Framework/Tests/Cli/CreateMigrationTest.php +++ b/tests/WebFiori/Framework/Tests/Cli/CreateMigrationTest.php @@ -61,6 +61,11 @@ public function testCreateMigration01() { "11" ])); $this->assertEquals(0, $this->getExitCode()); + + // Check if file was written and require it + $filePath = APP_PATH . 'Database' . DS . 'Migrations' . DS . $name . '.php'; + $this->assertTrue(file_exists($filePath), "Class file was not created: $filePath"); + require_once $filePath; $this->assertTrue(class_exists($clazz)); $this->removeClass($clazz); } From b78c71aab72fc5d5ba8ba446d97b1886a79d0d97 Mon Sep 17 00:00:00 2001 From: Ibrahim BinAlshikh Date: Thu, 9 Oct 2025 14:29:17 +0300 Subject: [PATCH 43/45] Update DatabaseMigrationWriterTest.php --- .../Tests/Writers/DatabaseMigrationWriterTest.php | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/tests/WebFiori/Framework/Tests/Writers/DatabaseMigrationWriterTest.php b/tests/WebFiori/Framework/Tests/Writers/DatabaseMigrationWriterTest.php index 819c157ca..c8ab581dd 100644 --- a/tests/WebFiori/Framework/Tests/Writers/DatabaseMigrationWriterTest.php +++ b/tests/WebFiori/Framework/Tests/Writers/DatabaseMigrationWriterTest.php @@ -85,6 +85,11 @@ public function test01() { $writter->writeClass(); $clazz = "\\App\\Database\\Migrations\\MyMigration"; + + // Check if file was written and require it + $filePath = $writter->getPath() . DS . $writter->getName() . '.php'; + $this->assertTrue(file_exists($filePath), "Class file was not created: $filePath"); + require_once $filePath; $this->assertTrue(class_exists($clazz)); $runner->register($clazz); $allClasses[] = $clazz; @@ -159,6 +164,11 @@ public function test03() { $this->assertEquals($name, $writter->getName()); $writter->writeClass(); $clazz = "\\App\\Database\\Migrations\\".$name; + + // Check if file was written and require it + $filePath = $writter->getPath() . DS . $writter->getName() . '.php'; + $this->assertTrue(file_exists($filePath), "Class file was not created: $filePath"); + require_once $filePath; $this->assertTrue(class_exists($clazz)); $runner->register($clazz); $allClasses[] = $clazz; From 6d5695273033fd63551acba7d2a44f265922bf7c Mon Sep 17 00:00:00 2001 From: Ibrahim BinAlshikh Date: Thu, 9 Oct 2025 14:47:32 +0300 Subject: [PATCH 44/45] Update DatabaseMigrationWriterTest.php --- .../Tests/Writers/DatabaseMigrationWriterTest.php | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/tests/WebFiori/Framework/Tests/Writers/DatabaseMigrationWriterTest.php b/tests/WebFiori/Framework/Tests/Writers/DatabaseMigrationWriterTest.php index c8ab581dd..e02dab022 100644 --- a/tests/WebFiori/Framework/Tests/Writers/DatabaseMigrationWriterTest.php +++ b/tests/WebFiori/Framework/Tests/Writers/DatabaseMigrationWriterTest.php @@ -113,6 +113,11 @@ public function test02() { $this->assertEquals('Migration000', $writter->getName()); $writter->writeClass(); $clazz = "\\App\\Database\\Migrations\\Migration000"; + + // Check if file was written and require it + $filePath = $writter->getPath() . DS . $writter->getName() . '.php'; + $this->assertTrue(file_exists($filePath), "Class file was not created: $filePath"); + require_once $filePath; $this->assertTrue(class_exists($clazz)); $runner->register($clazz); $allClasses[] = $clazz; @@ -128,7 +133,12 @@ public function test02() { $this->assertEquals('Migration001', $writter2->getName()); $writter2->writeClass(); $clazz2 = "\\App\\Database\\Migrations\\Migration001"; - $this->assertTrue(class_exists($clazz)); + + // Check if file was written and require it + $filePath2 = $writter2->getPath() . DS . $writter2->getName() . '.php'; + $this->assertTrue(file_exists($filePath2), "Class file was not created: $filePath2"); + require_once $filePath2; + $this->assertTrue(class_exists($clazz2)); $runner->register($clazz); $allClasses[] = $clazz; $runner3 = new SchemaRunner(null); From c2bac791aa6aca1bd9e8742c017d75e8574fd38d Mon Sep 17 00:00:00 2001 From: Ibrahim BinAlshikh Date: Thu, 9 Oct 2025 15:05:56 +0300 Subject: [PATCH 45/45] chore: Updated Version Number --- WebFiori/Framework/App.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/WebFiori/Framework/App.php b/WebFiori/Framework/App.php index 2ae349276..4113dfcac 100644 --- a/WebFiori/Framework/App.php +++ b/WebFiori/Framework/App.php @@ -642,7 +642,7 @@ public static function initFrameworkVersionInfo() { * * @since 2.1 */ - define('WF_VERSION', '3.0.0-Beta.28'); + define('WF_VERSION', '3.0.0-Beta.29'); /** * A constant that tells the type of framework version. * @@ -658,7 +658,7 @@ public static function initFrameworkVersionInfo() { * * @since 2.1 */ - define('WF_RELEASE_DATE', '2025-08-04'); + define('WF_RELEASE_DATE', '2025-10-09'); } /**