From c015d8c58b951bbaad6229ea89788b44dd52dc87 Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Sun, 4 Mar 2018 18:04:15 +0700 Subject: [PATCH] Refactored project structure. --- .codecov.yml | 4 ++-- bootstrap.php | 2 +- composer.json | 6 ++---- phpunit.xml | 10 +++------- src/{PHPCensor => }/Application.php | 0 src/{PHPCensor => }/BuildFactory.php | 0 src/{PHPCensor => }/Builder.php | 0 src/{PHPCensor => }/BuilderException.php | 0 .../Command/CreateAdminCommand.php | 0 .../Command/CreateBuildCommand.php | 0 src/{PHPCensor => }/Command/InstallCommand.php | 0 src/{PHPCensor => }/Command/RebuildCommand.php | 0 .../Command/RebuildQueueCommand.php | 0 src/{PHPCensor => }/Command/RunCommand.php | 0 .../Command/ScheduleBuildCommand.php | 0 src/{PHPCensor => }/Command/WorkerCommand.php | 0 src/{PHPCensor => }/Config.php | 0 src/{PHPCensor => }/Console/Application.php | 2 +- src/{PHPCensor => }/Controller.php | 0 .../Controller/BuildController.php | 0 .../Controller/BuildStatusController.php | 0 .../Controller/GroupController.php | 0 .../Controller/HomeController.php | 0 .../Controller/ProjectController.php | 0 .../Controller/SessionController.php | 0 .../Controller/UserController.php | 0 .../Controller/WebhookController.php | 0 .../Controller/WidgetAllProjectsController.php | 0 .../Controller/WidgetBuildErrorsController.php | 0 .../Controller/WidgetLastBuildsController.php | 0 src/{PHPCensor => }/Database.php | 0 src/{PHPCensor => }/Exception/HttpException.php | 0 .../HttpException/BadRequestException.php | 0 .../HttpException/ForbiddenException.php | 0 .../HttpException/NotAuthorizedException.php | 0 .../HttpException/NotFoundException.php | 0 .../HttpException/ServerErrorException.php | 0 .../HttpException/ValidationException.php | 0 src/{PHPCensor => }/Form.php | 0 src/{PHPCensor => }/Form/ControlGroup.php | 0 src/{PHPCensor => }/Form/Element.php | 8 +------- src/{PHPCensor => }/Form/Element/Button.php | 0 src/{PHPCensor => }/Form/Element/Checkbox.php | 0 .../Form/Element/CheckboxGroup.php | 0 src/{PHPCensor => }/Form/Element/Csrf.php | 0 src/{PHPCensor => }/Form/Element/Email.php | 0 src/{PHPCensor => }/Form/Element/Hidden.php | 0 src/{PHPCensor => }/Form/Element/Password.php | 0 src/{PHPCensor => }/Form/Element/Radio.php | 0 src/{PHPCensor => }/Form/Element/Select.php | 0 src/{PHPCensor => }/Form/Element/Submit.php | 0 src/{PHPCensor => }/Form/Element/Text.php | 0 src/{PHPCensor => }/Form/Element/TextArea.php | 0 src/{PHPCensor => }/Form/Element/Url.php | 0 src/{PHPCensor => }/Form/FieldSet.php | 0 src/{PHPCensor => }/Form/Input.php | 0 src/{PHPCensor => }/Helper/AnsiConverter.php | 0 src/{PHPCensor => }/Helper/Bitbucket.php | 0 src/{PHPCensor => }/Helper/Build.php | 0 src/{PHPCensor => }/Helper/BuildInterpolator.php | 0 src/{PHPCensor => }/Helper/CommandExecutor.php | 0 .../Helper/CommandExecutorInterface.php | 0 src/{PHPCensor => }/Helper/Diff.php | 0 src/{PHPCensor => }/Helper/Email.php | 0 src/{PHPCensor => }/Helper/Github.php | 0 src/{PHPCensor => }/Helper/Lang.php | 0 src/{PHPCensor => }/Helper/MailerFactory.php | 0 src/{PHPCensor => }/Helper/SshKey.php | 0 src/{PHPCensor => }/Http/Request.php | 0 src/{PHPCensor => }/Http/Response.php | 0 .../Http/Response/JsonResponse.php | 0 .../Http/Response/RedirectResponse.php | 0 src/{PHPCensor => }/Http/Router.php | 0 src/{PHPCensor => }/Languages/lang.da.php | 0 src/{PHPCensor => }/Languages/lang.de.php | 0 src/{PHPCensor => }/Languages/lang.el.php | 0 src/{PHPCensor => }/Languages/lang.en.php | 0 src/{PHPCensor => }/Languages/lang.es.php | 0 src/{PHPCensor => }/Languages/lang.fr.php | 0 src/{PHPCensor => }/Languages/lang.it.php | 0 src/{PHPCensor => }/Languages/lang.nl.php | 0 src/{PHPCensor => }/Languages/lang.pl.php | 0 src/{PHPCensor => }/Languages/lang.pt-br.php | 0 src/{PHPCensor => }/Languages/lang.ru.php | 0 src/{PHPCensor => }/Languages/lang.uk.php | 0 src/{PHPCensor => }/Languages/lang.zh.php | 0 .../Logging/BuildDBLogHandler.php | 0 src/{PHPCensor => }/Logging/BuildLogger.php | 0 src/{PHPCensor => }/Logging/Handler.php | 0 .../Logging/LoggedBuildContextTidier.php | 0 src/{PHPCensor => }/Logging/OutputLogHandler.php | 0 .../20140513143726_initial_migration.php | 0 ...0140513153133_change_build_keys_migration.php | 0 .../Migrations/20140611170618_choose_branch.php | 0 .../20140730143702_fix_database_columns.php | 0 .../20150131075425_archive_project.php | 0 .../20150203105015_fix_column_types.php | 0 .../20150308074509_add_user_providers.php | 0 ...4174958_unique_email_and_name_user_fields.php | 0 .../20151008140800_add_project_groups.php | 0 .../20151009100610_remove_unique_name_index.php | 0 .../Migrations/20151014091859_errors_table.php | 0 .../Migrations/20151015124825_convert_errors.php | 0 .../20160425162114_branch_column_length.php | 0 .../20160623100223_project_table_defaults.php | 0 ...3312_added_language_and_per_page_for_user.php | 0 ...18175400_fixed_build_error_message_column.php | 0 ...23113127_fixed_build_log_column_for_mysql.php | 0 ...6132922_fixed_build_log_column_for_mysql2.php | 0 .../20170321131931_add_environment.php | 0 ...131256_added_source_column_to_build_table.php | 0 .../20170416130610_fixed_environments.php | 0 ...420142131_added_tag_column_to_build_table.php | 0 ...20170711112805_fixed_build_meta_for_mysql.php | 0 .../20170828142020_added_remember_me_login.php | 0 .../20170913141438_added_default_branch_only.php | 0 ...173348_removed_project_id_from_build_meta.php | 0 .../20171015123827_added_additional_columns.php | 0 .../20171016143000_added_additional_columns2.php | 0 .../20171019143346_added_additional_columns3.php | 0 ...20171209135004_added_new_label_for_errors.php | 0 ...80223052715_added_request_branch_to_build.php | 0 .../20180228024622_renamed_build_types.php | 0 src/{PHPCensor => }/Model.php | 0 src/{PHPCensor => }/Model/Build.php | 0 .../Model/Build/BitbucketBuild.php | 0 .../Model/Build/BitbucketHgBuild.php | 0 src/{PHPCensor => }/Model/Build/GitBuild.php | 0 src/{PHPCensor => }/Model/Build/GithubBuild.php | 0 src/{PHPCensor => }/Model/Build/GitlabBuild.php | 0 src/{PHPCensor => }/Model/Build/GogsBuild.php | 0 src/{PHPCensor => }/Model/Build/HgBuild.php | 0 src/{PHPCensor => }/Model/Build/LocalBuild.php | 0 src/{PHPCensor => }/Model/Build/SvnBuild.php | 0 src/{PHPCensor => }/Model/BuildError.php | 0 src/{PHPCensor => }/Model/BuildMeta.php | 0 src/{PHPCensor => }/Model/Environment.php | 0 src/{PHPCensor => }/Model/Project.php | 0 src/{PHPCensor => }/Model/ProjectGroup.php | 0 src/{PHPCensor => }/Model/User.php | 0 src/{PHPCensor => }/Plugin.php | 0 src/{PHPCensor => }/Plugin/Atoum.php | 0 src/{PHPCensor => }/Plugin/Behat.php | 0 src/{PHPCensor => }/Plugin/Campfire.php | 0 src/{PHPCensor => }/Plugin/CleanBuild.php | 0 src/{PHPCensor => }/Plugin/Codeception.php | 0 src/{PHPCensor => }/Plugin/Composer.php | 0 src/{PHPCensor => }/Plugin/CopyBuild.php | 0 src/{PHPCensor => }/Plugin/Deployer.php | 0 src/{PHPCensor => }/Plugin/Email.php | 0 src/{PHPCensor => }/Plugin/Env.php | 0 src/{PHPCensor => }/Plugin/FlowdockNotify.php | 0 src/{PHPCensor => }/Plugin/Git.php | 0 src/{PHPCensor => }/Plugin/Grunt.php | 0 src/{PHPCensor => }/Plugin/Gulp.php | 0 src/{PHPCensor => }/Plugin/HipchatNotify.php | 0 src/{PHPCensor => }/Plugin/Irc.php | 0 src/{PHPCensor => }/Plugin/Lint.php | 0 src/{PHPCensor => }/Plugin/Mage.php | 0 src/{PHPCensor => }/Plugin/Mage3.php | 0 src/{PHPCensor => }/Plugin/Mysql.php | 0 .../Plugin/Option/PhpUnitOptions.php | 0 src/{PHPCensor => }/Plugin/PackageBuild.php | 0 src/{PHPCensor => }/Plugin/Pdepend.php | 0 src/{PHPCensor => }/Plugin/Pgsql.php | 0 src/{PHPCensor => }/Plugin/Phar.php | 0 src/{PHPCensor => }/Plugin/Phing.php | 0 src/{PHPCensor => }/Plugin/PhpCodeSniffer.php | 0 src/{PHPCensor => }/Plugin/PhpCpd.php | 0 src/{PHPCensor => }/Plugin/PhpCsFixer.php | 0 .../Plugin/PhpDocblockChecker.php | 0 src/{PHPCensor => }/Plugin/PhpLoc.php | 0 src/{PHPCensor => }/Plugin/PhpMessDetector.php | 0 src/{PHPCensor => }/Plugin/PhpParallelLint.php | 0 src/{PHPCensor => }/Plugin/PhpSpec.php | 0 src/{PHPCensor => }/Plugin/PhpTalLint.php | 4 ++-- src/{PHPCensor => }/Plugin/PhpUnit.php | 0 src/{PHPCensor => }/Plugin/SecurityChecker.php | 0 src/{PHPCensor => }/Plugin/Shell.php | 0 src/{PHPCensor => }/Plugin/SlackNotify.php | 0 src/{PHPCensor => }/Plugin/Sqlite.php | 0 src/{PHPCensor => }/Plugin/TechnicalDebt.php | 0 src/{PHPCensor => }/Plugin/Util/Executor.php | 0 src/{PHPCensor => }/Plugin/Util/Factory.php | 0 .../Plugin/Util/PhpUnitResult.php | 0 .../Plugin/Util/PhpUnitResultJson.php | 0 .../Plugin/Util/PhpUnitResultJunit.php | 0 .../Util/TestResultParsers/Codeception.php | 0 .../Util/TestResultParsers/ParserInterface.php | 0 src/{PHPCensor => }/Plugin/Wipe.php | 0 src/{PHPCensor => }/Plugin/Xmpp.php | 0 src/{PHPCensor => }/ProcessControl/Factory.php | 0 .../ProcessControl/PosixProcessControl.php | 0 .../ProcessControl/ProcessControlInterface.php | 0 .../ProcessControl/UnixProcessControl.php | 0 .../LoginPasswordProviderInterface.php | 0 .../Security/Authentication/Service.php | 0 .../UserProvider/AbstractProvider.php | 0 .../Authentication/UserProvider/Internal.php | 0 .../Authentication/UserProvider/Ldap.php | 0 .../Authentication/UserProviderInterface.php | 0 src/{PHPCensor => }/Service/BuildService.php | 0 .../Service/BuildStatusService.php | 0 src/{PHPCensor => }/Service/ProjectService.php | 0 src/{PHPCensor => }/Service/UserService.php | 0 src/{PHPCensor => }/Store.php | 0 src/{PHPCensor => }/Store/BuildErrorStore.php | 0 src/{PHPCensor => }/Store/BuildErrorWriter.php | 0 src/{PHPCensor => }/Store/BuildMetaStore.php | 0 src/{PHPCensor => }/Store/BuildStore.php | 0 src/{PHPCensor => }/Store/EnvironmentStore.php | 0 src/{PHPCensor => }/Store/Factory.php | 0 src/{PHPCensor => }/Store/ProjectGroupStore.php | 0 src/{PHPCensor => }/Store/ProjectStore.php | 0 src/{PHPCensor => }/Store/UserStore.php | 0 src/{PHPCensor => }/View.php | 0 src/{PHPCensor => }/View/Build/errors.phtml | 0 src/{PHPCensor => }/View/Build/header-row.phtml | 0 src/{PHPCensor => }/View/Build/view.phtml | 0 src/{PHPCensor => }/View/BuildStatus/view.phtml | 0 src/{PHPCensor => }/View/Email/layout.phtml | 2 +- src/{PHPCensor => }/View/Email/long.phtml | 0 src/{PHPCensor => }/View/Email/short.phtml | 0 .../Form/View => View/Form}/Button.phtml | 0 .../Form/View => View/Form}/Checkbox.phtml | 0 .../Form/View => View/Form}/CheckboxGroup.phtml | 0 .../Form/View => View/Form}/ControlGroup.phtml | 0 .../Form/View => View/Form}/Csrf.phtml | 0 .../Form/View => View/Form}/FieldSet.phtml | 0 .../Form/View => View/Form}/Form.phtml | 0 .../Form/View => View/Form}/Hidden.phtml | 0 .../Form/View => View/Form}/Radio.phtml | 0 .../Form/View => View/Form}/Select.phtml | 0 .../Form/View => View/Form}/Text.phtml | 0 .../Form/View => View/Form}/TextArea.phtml | 0 src/{PHPCensor => }/View/Group/edit.phtml | 0 src/{PHPCensor => }/View/Group/index.phtml | 0 src/{PHPCensor => }/View/Home/index.phtml | 0 .../View/Project/ajax-builds.phtml | 0 src/{PHPCensor => }/View/Project/edit.phtml | 0 src/{PHPCensor => }/View/Project/view.phtml | 0 src/{PHPCensor => }/View/Session.phtml | 0 .../View/Session/forgotPassword.phtml | 0 src/{PHPCensor => }/View/Session/login.phtml | 0 .../View/Session/resetPassword.phtml | 0 src/{PHPCensor => }/View/User/edit.phtml | 0 src/{PHPCensor => }/View/User/index.phtml | 0 src/{PHPCensor => }/View/User/profile.phtml | 0 .../View/WidgetAllProjects/index-projects.phtml | 0 .../View/WidgetAllProjects/index.phtml | 0 .../View/WidgetAllProjects/update.phtml | 0 .../View/WidgetBuildErrors/empty.phtml | 0 .../View/WidgetBuildErrors/index.phtml | 0 .../View/WidgetBuildErrors/update.phtml | 0 .../View/WidgetLastBuilds/index.phtml | 0 .../View/WidgetLastBuilds/update.phtml | 0 src/{PHPCensor => }/View/exception.phtml | 0 src/{PHPCensor => }/View/layout.phtml | 0 src/{PHPCensor => }/View/pagination.phtml | 0 src/{PHPCensor => }/Worker/BuildWorker.php | 0 .../ZeroConfigPluginInterface.php | 0 tests/bootstrap.php | 2 +- .../Plugin/PhpUnit}/invalid_format.txt | 0 .../Plugin/PhpUnit}/phpunit_money.txt | 0 .../Plugin/PhpUnit}/phpunit_money_junit.xml | 0 .../data/view => data/View}/Form/form.phtml | 0 .../data/view => data/View}/simple.phtml | 0 .../data/view => data/View}/vars.phtml | 0 tests/{temp => runtime}/.gitkeep | 0 .../Command/CreateAdminCommandTest.php | 2 +- .../Command/CreateBuildCommandTest.php | 0 .../Command/InstallCommandTest.php | 2 +- .../Controller/WebhookControllerTest.php | 0 tests/{PHPCensor => src}/DatabaseMysqlTest.php | 0 .../DatabasePostgresqlTest.php | 0 tests/{PHPCensor => src}/FormTest.php | 1 - .../Helper/AnsiConverterTest.php | 0 .../Helper/BuildInterpolatorTest.php | 2 +- .../Helper/CommandExecutorTest.php | 0 .../Helper/MailerFactoryTest.php | 2 +- tests/{PHPCensor => src}/HttpExceptionTest.php | 0 .../Logging/BuildLoggerTest.php | 2 +- tests/{PHPCensor => src}/Model/BuildTest.php | 0 tests/{PHPCensor => src}/Model/ProjectTest.php | 0 tests/{PHPCensor => src}/Plugin/EmailTest.php | 0 .../Plugin/Option/PhpUnitOptionsTest.php | 2 +- tests/{PHPCensor => src}/Plugin/PharTest.php | 2 +- tests/{PHPCensor => src}/Plugin/PhpUnitTest.php | 0 .../Plugin/Util/ExecutorTest.php | 16 +++++++++------- .../Plugin/Util/FactoryTest.php | 0 .../Plugin/Util/Fake/ExamplePluginFull.php | 0 .../Fake/ExamplePluginWithNoConstructorArgs.php | 0 .../Fake/ExamplePluginWithSingleOptionalArg.php | 0 .../Fake/ExamplePluginWithSingleRequiredArg.php | 0 .../ExamplePluginWithSingleTypedRequiredArg.php | 0 .../Plugin/Util/PhpUnitResultTest.php | 4 ++-- .../ProcessControl/PosixProcessControlTest.php | 1 + .../ProcessControl/ProcessControlTest.php | 1 + .../ProcessControl/UnixProcessControlTest.php | 1 + .../Security/Authentication/ServiceTest.php | 0 .../Authentication/UserProvider/InternalTest.php | 0 .../Service/BuildServiceTest.php | 0 .../Service/BuiltStatusServiceTest.php | 2 +- .../Service/ProjectServiceTest.php | 0 .../Service/UserServiceTest.php | 0 tests/{PHPCensor => src}/StoreMysqlTest.php | 0 tests/{PHPCensor => src}/StorePostgresqlTest.php | 0 tests/{PHPCensor => src}/ViewTest.php | 6 +++--- 308 files changed, 39 insertions(+), 47 deletions(-) rename src/{PHPCensor => }/Application.php (100%) rename src/{PHPCensor => }/BuildFactory.php (100%) rename src/{PHPCensor => }/Builder.php (100%) rename src/{PHPCensor => }/BuilderException.php (100%) rename src/{PHPCensor => }/Command/CreateAdminCommand.php (100%) rename src/{PHPCensor => }/Command/CreateBuildCommand.php (100%) rename src/{PHPCensor => }/Command/InstallCommand.php (100%) rename src/{PHPCensor => }/Command/RebuildCommand.php (100%) rename src/{PHPCensor => }/Command/RebuildQueueCommand.php (100%) rename src/{PHPCensor => }/Command/RunCommand.php (100%) rename src/{PHPCensor => }/Command/ScheduleBuildCommand.php (100%) rename src/{PHPCensor => }/Command/WorkerCommand.php (100%) rename src/{PHPCensor => }/Config.php (100%) rename src/{PHPCensor => }/Console/Application.php (98%) rename src/{PHPCensor => }/Controller.php (100%) rename src/{PHPCensor => }/Controller/BuildController.php (100%) rename src/{PHPCensor => }/Controller/BuildStatusController.php (100%) rename src/{PHPCensor => }/Controller/GroupController.php (100%) rename src/{PHPCensor => }/Controller/HomeController.php (100%) rename src/{PHPCensor => }/Controller/ProjectController.php (100%) rename src/{PHPCensor => }/Controller/SessionController.php (100%) rename src/{PHPCensor => }/Controller/UserController.php (100%) rename src/{PHPCensor => }/Controller/WebhookController.php (100%) rename src/{PHPCensor => }/Controller/WidgetAllProjectsController.php (100%) rename src/{PHPCensor => }/Controller/WidgetBuildErrorsController.php (100%) rename src/{PHPCensor => }/Controller/WidgetLastBuildsController.php (100%) rename src/{PHPCensor => }/Database.php (100%) rename src/{PHPCensor => }/Exception/HttpException.php (100%) rename src/{PHPCensor => }/Exception/HttpException/BadRequestException.php (100%) rename src/{PHPCensor => }/Exception/HttpException/ForbiddenException.php (100%) rename src/{PHPCensor => }/Exception/HttpException/NotAuthorizedException.php (100%) rename src/{PHPCensor => }/Exception/HttpException/NotFoundException.php (100%) rename src/{PHPCensor => }/Exception/HttpException/ServerErrorException.php (100%) rename src/{PHPCensor => }/Exception/HttpException/ValidationException.php (100%) rename src/{PHPCensor => }/Form.php (100%) rename src/{PHPCensor => }/Form/ControlGroup.php (100%) rename src/{PHPCensor => }/Form/Element.php (92%) rename src/{PHPCensor => }/Form/Element/Button.php (100%) rename src/{PHPCensor => }/Form/Element/Checkbox.php (100%) rename src/{PHPCensor => }/Form/Element/CheckboxGroup.php (100%) rename src/{PHPCensor => }/Form/Element/Csrf.php (100%) rename src/{PHPCensor => }/Form/Element/Email.php (100%) rename src/{PHPCensor => }/Form/Element/Hidden.php (100%) rename src/{PHPCensor => }/Form/Element/Password.php (100%) rename src/{PHPCensor => }/Form/Element/Radio.php (100%) rename src/{PHPCensor => }/Form/Element/Select.php (100%) rename src/{PHPCensor => }/Form/Element/Submit.php (100%) rename src/{PHPCensor => }/Form/Element/Text.php (100%) rename src/{PHPCensor => }/Form/Element/TextArea.php (100%) rename src/{PHPCensor => }/Form/Element/Url.php (100%) rename src/{PHPCensor => }/Form/FieldSet.php (100%) rename src/{PHPCensor => }/Form/Input.php (100%) rename src/{PHPCensor => }/Helper/AnsiConverter.php (100%) rename src/{PHPCensor => }/Helper/Bitbucket.php (100%) rename src/{PHPCensor => }/Helper/Build.php (100%) rename src/{PHPCensor => }/Helper/BuildInterpolator.php (100%) rename src/{PHPCensor => }/Helper/CommandExecutor.php (100%) rename src/{PHPCensor => }/Helper/CommandExecutorInterface.php (100%) rename src/{PHPCensor => }/Helper/Diff.php (100%) rename src/{PHPCensor => }/Helper/Email.php (100%) rename src/{PHPCensor => }/Helper/Github.php (100%) rename src/{PHPCensor => }/Helper/Lang.php (100%) rename src/{PHPCensor => }/Helper/MailerFactory.php (100%) rename src/{PHPCensor => }/Helper/SshKey.php (100%) rename src/{PHPCensor => }/Http/Request.php (100%) rename src/{PHPCensor => }/Http/Response.php (100%) rename src/{PHPCensor => }/Http/Response/JsonResponse.php (100%) rename src/{PHPCensor => }/Http/Response/RedirectResponse.php (100%) rename src/{PHPCensor => }/Http/Router.php (100%) rename src/{PHPCensor => }/Languages/lang.da.php (100%) rename src/{PHPCensor => }/Languages/lang.de.php (100%) rename src/{PHPCensor => }/Languages/lang.el.php (100%) rename src/{PHPCensor => }/Languages/lang.en.php (100%) rename src/{PHPCensor => }/Languages/lang.es.php (100%) rename src/{PHPCensor => }/Languages/lang.fr.php (100%) rename src/{PHPCensor => }/Languages/lang.it.php (100%) rename src/{PHPCensor => }/Languages/lang.nl.php (100%) rename src/{PHPCensor => }/Languages/lang.pl.php (100%) rename src/{PHPCensor => }/Languages/lang.pt-br.php (100%) rename src/{PHPCensor => }/Languages/lang.ru.php (100%) rename src/{PHPCensor => }/Languages/lang.uk.php (100%) rename src/{PHPCensor => }/Languages/lang.zh.php (100%) rename src/{PHPCensor => }/Logging/BuildDBLogHandler.php (100%) rename src/{PHPCensor => }/Logging/BuildLogger.php (100%) rename src/{PHPCensor => }/Logging/Handler.php (100%) rename src/{PHPCensor => }/Logging/LoggedBuildContextTidier.php (100%) rename src/{PHPCensor => }/Logging/OutputLogHandler.php (100%) rename src/{PHPCensor => }/Migrations/20140513143726_initial_migration.php (100%) rename src/{PHPCensor => }/Migrations/20140513153133_change_build_keys_migration.php (100%) rename src/{PHPCensor => }/Migrations/20140611170618_choose_branch.php (100%) rename src/{PHPCensor => }/Migrations/20140730143702_fix_database_columns.php (100%) rename src/{PHPCensor => }/Migrations/20150131075425_archive_project.php (100%) rename src/{PHPCensor => }/Migrations/20150203105015_fix_column_types.php (100%) rename src/{PHPCensor => }/Migrations/20150308074509_add_user_providers.php (100%) rename src/{PHPCensor => }/Migrations/20150324174958_unique_email_and_name_user_fields.php (100%) rename src/{PHPCensor => }/Migrations/20151008140800_add_project_groups.php (100%) rename src/{PHPCensor => }/Migrations/20151009100610_remove_unique_name_index.php (100%) rename src/{PHPCensor => }/Migrations/20151014091859_errors_table.php (100%) rename src/{PHPCensor => }/Migrations/20151015124825_convert_errors.php (100%) rename src/{PHPCensor => }/Migrations/20160425162114_branch_column_length.php (100%) rename src/{PHPCensor => }/Migrations/20160623100223_project_table_defaults.php (100%) rename src/{PHPCensor => }/Migrations/20170103163312_added_language_and_per_page_for_user.php (100%) rename src/{PHPCensor => }/Migrations/20170218175400_fixed_build_error_message_column.php (100%) rename src/{PHPCensor => }/Migrations/20170223113127_fixed_build_log_column_for_mysql.php (100%) rename src/{PHPCensor => }/Migrations/20170226132922_fixed_build_log_column_for_mysql2.php (100%) rename src/{PHPCensor => }/Migrations/20170321131931_add_environment.php (100%) rename src/{PHPCensor => }/Migrations/20170413131256_added_source_column_to_build_table.php (100%) rename src/{PHPCensor => }/Migrations/20170416130610_fixed_environments.php (100%) rename src/{PHPCensor => }/Migrations/20170420142131_added_tag_column_to_build_table.php (100%) rename src/{PHPCensor => }/Migrations/20170711112805_fixed_build_meta_for_mysql.php (100%) rename src/{PHPCensor => }/Migrations/20170828142020_added_remember_me_login.php (100%) rename src/{PHPCensor => }/Migrations/20170913141438_added_default_branch_only.php (100%) rename src/{PHPCensor => }/Migrations/20171014173348_removed_project_id_from_build_meta.php (100%) rename src/{PHPCensor => }/Migrations/20171015123827_added_additional_columns.php (100%) rename src/{PHPCensor => }/Migrations/20171016143000_added_additional_columns2.php (100%) rename src/{PHPCensor => }/Migrations/20171019143346_added_additional_columns3.php (100%) rename src/{PHPCensor => }/Migrations/20171209135004_added_new_label_for_errors.php (100%) rename src/{PHPCensor => }/Migrations/20180223052715_added_request_branch_to_build.php (100%) rename src/{PHPCensor => }/Migrations/20180228024622_renamed_build_types.php (100%) rename src/{PHPCensor => }/Model.php (100%) rename src/{PHPCensor => }/Model/Build.php (100%) rename src/{PHPCensor => }/Model/Build/BitbucketBuild.php (100%) rename src/{PHPCensor => }/Model/Build/BitbucketHgBuild.php (100%) rename src/{PHPCensor => }/Model/Build/GitBuild.php (100%) rename src/{PHPCensor => }/Model/Build/GithubBuild.php (100%) rename src/{PHPCensor => }/Model/Build/GitlabBuild.php (100%) rename src/{PHPCensor => }/Model/Build/GogsBuild.php (100%) rename src/{PHPCensor => }/Model/Build/HgBuild.php (100%) rename src/{PHPCensor => }/Model/Build/LocalBuild.php (100%) rename src/{PHPCensor => }/Model/Build/SvnBuild.php (100%) rename src/{PHPCensor => }/Model/BuildError.php (100%) rename src/{PHPCensor => }/Model/BuildMeta.php (100%) rename src/{PHPCensor => }/Model/Environment.php (100%) rename src/{PHPCensor => }/Model/Project.php (100%) rename src/{PHPCensor => }/Model/ProjectGroup.php (100%) rename src/{PHPCensor => }/Model/User.php (100%) rename src/{PHPCensor => }/Plugin.php (100%) rename src/{PHPCensor => }/Plugin/Atoum.php (100%) rename src/{PHPCensor => }/Plugin/Behat.php (100%) rename src/{PHPCensor => }/Plugin/Campfire.php (100%) rename src/{PHPCensor => }/Plugin/CleanBuild.php (100%) rename src/{PHPCensor => }/Plugin/Codeception.php (100%) rename src/{PHPCensor => }/Plugin/Composer.php (100%) rename src/{PHPCensor => }/Plugin/CopyBuild.php (100%) rename src/{PHPCensor => }/Plugin/Deployer.php (100%) rename src/{PHPCensor => }/Plugin/Email.php (100%) rename src/{PHPCensor => }/Plugin/Env.php (100%) rename src/{PHPCensor => }/Plugin/FlowdockNotify.php (100%) rename src/{PHPCensor => }/Plugin/Git.php (100%) rename src/{PHPCensor => }/Plugin/Grunt.php (100%) rename src/{PHPCensor => }/Plugin/Gulp.php (100%) rename src/{PHPCensor => }/Plugin/HipchatNotify.php (100%) rename src/{PHPCensor => }/Plugin/Irc.php (100%) rename src/{PHPCensor => }/Plugin/Lint.php (100%) rename src/{PHPCensor => }/Plugin/Mage.php (100%) rename src/{PHPCensor => }/Plugin/Mage3.php (100%) rename src/{PHPCensor => }/Plugin/Mysql.php (100%) rename src/{PHPCensor => }/Plugin/Option/PhpUnitOptions.php (100%) rename src/{PHPCensor => }/Plugin/PackageBuild.php (100%) rename src/{PHPCensor => }/Plugin/Pdepend.php (100%) rename src/{PHPCensor => }/Plugin/Pgsql.php (100%) rename src/{PHPCensor => }/Plugin/Phar.php (100%) rename src/{PHPCensor => }/Plugin/Phing.php (100%) rename src/{PHPCensor => }/Plugin/PhpCodeSniffer.php (100%) rename src/{PHPCensor => }/Plugin/PhpCpd.php (100%) rename src/{PHPCensor => }/Plugin/PhpCsFixer.php (100%) rename src/{PHPCensor => }/Plugin/PhpDocblockChecker.php (100%) rename src/{PHPCensor => }/Plugin/PhpLoc.php (100%) rename src/{PHPCensor => }/Plugin/PhpMessDetector.php (100%) rename src/{PHPCensor => }/Plugin/PhpParallelLint.php (100%) rename src/{PHPCensor => }/Plugin/PhpSpec.php (100%) rename src/{PHPCensor => }/Plugin/PhpTalLint.php (98%) rename src/{PHPCensor => }/Plugin/PhpUnit.php (100%) rename src/{PHPCensor => }/Plugin/SecurityChecker.php (100%) rename src/{PHPCensor => }/Plugin/Shell.php (100%) rename src/{PHPCensor => }/Plugin/SlackNotify.php (100%) rename src/{PHPCensor => }/Plugin/Sqlite.php (100%) rename src/{PHPCensor => }/Plugin/TechnicalDebt.php (100%) rename src/{PHPCensor => }/Plugin/Util/Executor.php (100%) rename src/{PHPCensor => }/Plugin/Util/Factory.php (100%) rename src/{PHPCensor => }/Plugin/Util/PhpUnitResult.php (100%) rename src/{PHPCensor => }/Plugin/Util/PhpUnitResultJson.php (100%) rename src/{PHPCensor => }/Plugin/Util/PhpUnitResultJunit.php (100%) rename src/{PHPCensor => }/Plugin/Util/TestResultParsers/Codeception.php (100%) rename src/{PHPCensor => }/Plugin/Util/TestResultParsers/ParserInterface.php (100%) rename src/{PHPCensor => }/Plugin/Wipe.php (100%) rename src/{PHPCensor => }/Plugin/Xmpp.php (100%) rename src/{PHPCensor => }/ProcessControl/Factory.php (100%) rename src/{PHPCensor => }/ProcessControl/PosixProcessControl.php (100%) rename src/{PHPCensor => }/ProcessControl/ProcessControlInterface.php (100%) rename src/{PHPCensor => }/ProcessControl/UnixProcessControl.php (100%) rename src/{PHPCensor => }/Security/Authentication/LoginPasswordProviderInterface.php (100%) rename src/{PHPCensor => }/Security/Authentication/Service.php (100%) rename src/{PHPCensor => }/Security/Authentication/UserProvider/AbstractProvider.php (100%) rename src/{PHPCensor => }/Security/Authentication/UserProvider/Internal.php (100%) rename src/{PHPCensor => }/Security/Authentication/UserProvider/Ldap.php (100%) rename src/{PHPCensor => }/Security/Authentication/UserProviderInterface.php (100%) rename src/{PHPCensor => }/Service/BuildService.php (100%) rename src/{PHPCensor => }/Service/BuildStatusService.php (100%) rename src/{PHPCensor => }/Service/ProjectService.php (100%) rename src/{PHPCensor => }/Service/UserService.php (100%) rename src/{PHPCensor => }/Store.php (100%) rename src/{PHPCensor => }/Store/BuildErrorStore.php (100%) rename src/{PHPCensor => }/Store/BuildErrorWriter.php (100%) rename src/{PHPCensor => }/Store/BuildMetaStore.php (100%) rename src/{PHPCensor => }/Store/BuildStore.php (100%) rename src/{PHPCensor => }/Store/EnvironmentStore.php (100%) rename src/{PHPCensor => }/Store/Factory.php (100%) rename src/{PHPCensor => }/Store/ProjectGroupStore.php (100%) rename src/{PHPCensor => }/Store/ProjectStore.php (100%) rename src/{PHPCensor => }/Store/UserStore.php (100%) rename src/{PHPCensor => }/View.php (100%) rename src/{PHPCensor => }/View/Build/errors.phtml (100%) rename src/{PHPCensor => }/View/Build/header-row.phtml (100%) rename src/{PHPCensor => }/View/Build/view.phtml (100%) rename src/{PHPCensor => }/View/BuildStatus/view.phtml (100%) rename src/{PHPCensor => }/View/Email/layout.phtml (93%) rename src/{PHPCensor => }/View/Email/long.phtml (100%) rename src/{PHPCensor => }/View/Email/short.phtml (100%) rename src/{PHPCensor/Form/View => View/Form}/Button.phtml (100%) rename src/{PHPCensor/Form/View => View/Form}/Checkbox.phtml (100%) rename src/{PHPCensor/Form/View => View/Form}/CheckboxGroup.phtml (100%) rename src/{PHPCensor/Form/View => View/Form}/ControlGroup.phtml (100%) rename src/{PHPCensor/Form/View => View/Form}/Csrf.phtml (100%) rename src/{PHPCensor/Form/View => View/Form}/FieldSet.phtml (100%) rename src/{PHPCensor/Form/View => View/Form}/Form.phtml (100%) rename src/{PHPCensor/Form/View => View/Form}/Hidden.phtml (100%) rename src/{PHPCensor/Form/View => View/Form}/Radio.phtml (100%) rename src/{PHPCensor/Form/View => View/Form}/Select.phtml (100%) rename src/{PHPCensor/Form/View => View/Form}/Text.phtml (100%) rename src/{PHPCensor/Form/View => View/Form}/TextArea.phtml (100%) rename src/{PHPCensor => }/View/Group/edit.phtml (100%) rename src/{PHPCensor => }/View/Group/index.phtml (100%) rename src/{PHPCensor => }/View/Home/index.phtml (100%) rename src/{PHPCensor => }/View/Project/ajax-builds.phtml (100%) rename src/{PHPCensor => }/View/Project/edit.phtml (100%) rename src/{PHPCensor => }/View/Project/view.phtml (100%) rename src/{PHPCensor => }/View/Session.phtml (100%) rename src/{PHPCensor => }/View/Session/forgotPassword.phtml (100%) rename src/{PHPCensor => }/View/Session/login.phtml (100%) rename src/{PHPCensor => }/View/Session/resetPassword.phtml (100%) rename src/{PHPCensor => }/View/User/edit.phtml (100%) rename src/{PHPCensor => }/View/User/index.phtml (100%) rename src/{PHPCensor => }/View/User/profile.phtml (100%) rename src/{PHPCensor => }/View/WidgetAllProjects/index-projects.phtml (100%) rename src/{PHPCensor => }/View/WidgetAllProjects/index.phtml (100%) rename src/{PHPCensor => }/View/WidgetAllProjects/update.phtml (100%) rename src/{PHPCensor => }/View/WidgetBuildErrors/empty.phtml (100%) rename src/{PHPCensor => }/View/WidgetBuildErrors/index.phtml (100%) rename src/{PHPCensor => }/View/WidgetBuildErrors/update.phtml (100%) rename src/{PHPCensor => }/View/WidgetLastBuilds/index.phtml (100%) rename src/{PHPCensor => }/View/WidgetLastBuilds/update.phtml (100%) rename src/{PHPCensor => }/View/exception.phtml (100%) rename src/{PHPCensor => }/View/layout.phtml (100%) rename src/{PHPCensor => }/View/pagination.phtml (100%) rename src/{PHPCensor => }/Worker/BuildWorker.php (100%) rename src/{PHPCensor => }/ZeroConfigPluginInterface.php (100%) rename tests/{PHPCensor/Plugin/SampleFiles => data/Plugin/PhpUnit}/invalid_format.txt (100%) rename tests/{PHPCensor/Plugin/SampleFiles => data/Plugin/PhpUnit}/phpunit_money.txt (100%) rename tests/{PHPCensor/Plugin/SampleFiles => data/Plugin/PhpUnit}/phpunit_money_junit.xml (100%) rename tests/{PHPCensor/data/view => data/View}/Form/form.phtml (100%) rename tests/{PHPCensor/data/view => data/View}/simple.phtml (100%) rename tests/{PHPCensor/data/view => data/View}/vars.phtml (100%) rename tests/{temp => runtime}/.gitkeep (100%) rename tests/{PHPCensor => src}/Command/CreateAdminCommandTest.php (97%) rename tests/{PHPCensor => src}/Command/CreateBuildCommandTest.php (100%) rename tests/{PHPCensor => src}/Command/InstallCommandTest.php (99%) rename tests/{PHPCensor => src}/Controller/WebhookControllerTest.php (100%) rename tests/{PHPCensor => src}/DatabaseMysqlTest.php (100%) rename tests/{PHPCensor => src}/DatabasePostgresqlTest.php (100%) rename tests/{PHPCensor => src}/FormTest.php (99%) rename tests/{PHPCensor => src}/Helper/AnsiConverterTest.php (100%) rename tests/{PHPCensor => src}/Helper/BuildInterpolatorTest.php (96%) rename tests/{PHPCensor => src}/Helper/CommandExecutorTest.php (100%) rename tests/{PHPCensor => src}/Helper/MailerFactoryTest.php (98%) rename tests/{PHPCensor => src}/HttpExceptionTest.php (100%) rename tests/{PHPCensor => src}/Logging/BuildLoggerTest.php (98%) rename tests/{PHPCensor => src}/Model/BuildTest.php (100%) rename tests/{PHPCensor => src}/Model/ProjectTest.php (100%) rename tests/{PHPCensor => src}/Plugin/EmailTest.php (100%) rename tests/{PHPCensor => src}/Plugin/Option/PhpUnitOptionsTest.php (98%) rename tests/{PHPCensor => src}/Plugin/PharTest.php (98%) rename tests/{PHPCensor => src}/Plugin/PhpUnitTest.php (100%) rename tests/{PHPCensor => src}/Plugin/Util/ExecutorTest.php (93%) rename tests/{PHPCensor => src}/Plugin/Util/FactoryTest.php (100%) rename tests/{PHPCensor => src}/Plugin/Util/Fake/ExamplePluginFull.php (100%) rename tests/{PHPCensor => src}/Plugin/Util/Fake/ExamplePluginWithNoConstructorArgs.php (100%) rename tests/{PHPCensor => src}/Plugin/Util/Fake/ExamplePluginWithSingleOptionalArg.php (100%) rename tests/{PHPCensor => src}/Plugin/Util/Fake/ExamplePluginWithSingleRequiredArg.php (100%) rename tests/{PHPCensor => src}/Plugin/Util/Fake/ExamplePluginWithSingleTypedRequiredArg.php (100%) rename tests/{PHPCensor => src}/Plugin/Util/PhpUnitResultTest.php (93%) rename tests/{PHPCensor => src}/ProcessControl/PosixProcessControlTest.php (99%) rename tests/{PHPCensor => src}/ProcessControl/ProcessControlTest.php (99%) rename tests/{PHPCensor => src}/ProcessControl/UnixProcessControlTest.php (99%) rename tests/{PHPCensor => src}/Security/Authentication/ServiceTest.php (100%) rename tests/{PHPCensor => src}/Security/Authentication/UserProvider/InternalTest.php (100%) rename tests/{PHPCensor => src}/Service/BuildServiceTest.php (100%) rename tests/{PHPCensor => src}/Service/BuiltStatusServiceTest.php (99%) rename tests/{PHPCensor => src}/Service/ProjectServiceTest.php (100%) rename tests/{PHPCensor => src}/Service/UserServiceTest.php (100%) rename tests/{PHPCensor => src}/StoreMysqlTest.php (100%) rename tests/{PHPCensor => src}/StorePostgresqlTest.php (100%) rename tests/{PHPCensor => src}/ViewTest.php (79%) diff --git a/.codecov.yml b/.codecov.yml index 2d4e363c..f98f123f 100644 --- a/.codecov.yml +++ b/.codecov.yml @@ -6,7 +6,7 @@ coverage: - "runtime" - "tests" - "vendor" - - "src/PHPCensor/Migrations" - - "src/PHPCensor/Languages" + - "src/Migrations" + - "src/Languages" comment: off diff --git a/bootstrap.php b/bootstrap.php index 796c720b..2bb67d62 100644 --- a/bootstrap.php +++ b/bootstrap.php @@ -5,7 +5,7 @@ if (!defined('ROOT_DIR')) { } if (!defined('SRC_DIR')) { - define('SRC_DIR', ROOT_DIR . 'src/PHPCensor/'); + define('SRC_DIR', ROOT_DIR . 'src/'); } if (!defined('PUBLIC_DIR')) { diff --git a/composer.json b/composer.json index 111af7df..90e36e05 100644 --- a/composer.json +++ b/composer.json @@ -36,14 +36,12 @@ }, "autoload": { "psr-4": { - "PHPCensor\\": "src/PHPCensor/", - "b8\\": "src/B8Framework/" + "PHPCensor\\": "src/" } }, "autoload-dev": { "psr-4": { - "Tests\\PHPCensor\\": "tests/PHPCensor/", - "Tests\\b8\\": "tests/B8Framework/" + "Tests\\PHPCensor\\": "tests/src/" } }, "require": { diff --git a/phpunit.xml b/phpunit.xml index 703620a2..2974b6b8 100644 --- a/phpunit.xml +++ b/phpunit.xml @@ -20,20 +20,16 @@ - - ./tests/B8Framework - - - ./tests/PHPCensor + ./tests/src ./src - ./src/PHPCensor/Migrations - ./src/PHPCensor/Languages + ./src/Migrations + ./src/Languages diff --git a/src/PHPCensor/Application.php b/src/Application.php similarity index 100% rename from src/PHPCensor/Application.php rename to src/Application.php diff --git a/src/PHPCensor/BuildFactory.php b/src/BuildFactory.php similarity index 100% rename from src/PHPCensor/BuildFactory.php rename to src/BuildFactory.php diff --git a/src/PHPCensor/Builder.php b/src/Builder.php similarity index 100% rename from src/PHPCensor/Builder.php rename to src/Builder.php diff --git a/src/PHPCensor/BuilderException.php b/src/BuilderException.php similarity index 100% rename from src/PHPCensor/BuilderException.php rename to src/BuilderException.php diff --git a/src/PHPCensor/Command/CreateAdminCommand.php b/src/Command/CreateAdminCommand.php similarity index 100% rename from src/PHPCensor/Command/CreateAdminCommand.php rename to src/Command/CreateAdminCommand.php diff --git a/src/PHPCensor/Command/CreateBuildCommand.php b/src/Command/CreateBuildCommand.php similarity index 100% rename from src/PHPCensor/Command/CreateBuildCommand.php rename to src/Command/CreateBuildCommand.php diff --git a/src/PHPCensor/Command/InstallCommand.php b/src/Command/InstallCommand.php similarity index 100% rename from src/PHPCensor/Command/InstallCommand.php rename to src/Command/InstallCommand.php diff --git a/src/PHPCensor/Command/RebuildCommand.php b/src/Command/RebuildCommand.php similarity index 100% rename from src/PHPCensor/Command/RebuildCommand.php rename to src/Command/RebuildCommand.php diff --git a/src/PHPCensor/Command/RebuildQueueCommand.php b/src/Command/RebuildQueueCommand.php similarity index 100% rename from src/PHPCensor/Command/RebuildQueueCommand.php rename to src/Command/RebuildQueueCommand.php diff --git a/src/PHPCensor/Command/RunCommand.php b/src/Command/RunCommand.php similarity index 100% rename from src/PHPCensor/Command/RunCommand.php rename to src/Command/RunCommand.php diff --git a/src/PHPCensor/Command/ScheduleBuildCommand.php b/src/Command/ScheduleBuildCommand.php similarity index 100% rename from src/PHPCensor/Command/ScheduleBuildCommand.php rename to src/Command/ScheduleBuildCommand.php diff --git a/src/PHPCensor/Command/WorkerCommand.php b/src/Command/WorkerCommand.php similarity index 100% rename from src/PHPCensor/Command/WorkerCommand.php rename to src/Command/WorkerCommand.php diff --git a/src/PHPCensor/Config.php b/src/Config.php similarity index 100% rename from src/PHPCensor/Config.php rename to src/Config.php diff --git a/src/PHPCensor/Console/Application.php b/src/Console/Application.php similarity index 98% rename from src/PHPCensor/Console/Application.php rename to src/Console/Application.php index d65031b9..470603ac 100644 --- a/src/PHPCensor/Console/Application.php +++ b/src/Console/Application.php @@ -86,7 +86,7 @@ LOGO; if ($databaseSettings) { $phinxSettings = [ 'paths' => [ - 'migrations' => ROOT_DIR . 'src/PHPCensor/Migrations', + 'migrations' => ROOT_DIR . 'src/Migrations', ], 'environments' => [ 'default_migration_table' => 'migration', diff --git a/src/PHPCensor/Controller.php b/src/Controller.php similarity index 100% rename from src/PHPCensor/Controller.php rename to src/Controller.php diff --git a/src/PHPCensor/Controller/BuildController.php b/src/Controller/BuildController.php similarity index 100% rename from src/PHPCensor/Controller/BuildController.php rename to src/Controller/BuildController.php diff --git a/src/PHPCensor/Controller/BuildStatusController.php b/src/Controller/BuildStatusController.php similarity index 100% rename from src/PHPCensor/Controller/BuildStatusController.php rename to src/Controller/BuildStatusController.php diff --git a/src/PHPCensor/Controller/GroupController.php b/src/Controller/GroupController.php similarity index 100% rename from src/PHPCensor/Controller/GroupController.php rename to src/Controller/GroupController.php diff --git a/src/PHPCensor/Controller/HomeController.php b/src/Controller/HomeController.php similarity index 100% rename from src/PHPCensor/Controller/HomeController.php rename to src/Controller/HomeController.php diff --git a/src/PHPCensor/Controller/ProjectController.php b/src/Controller/ProjectController.php similarity index 100% rename from src/PHPCensor/Controller/ProjectController.php rename to src/Controller/ProjectController.php diff --git a/src/PHPCensor/Controller/SessionController.php b/src/Controller/SessionController.php similarity index 100% rename from src/PHPCensor/Controller/SessionController.php rename to src/Controller/SessionController.php diff --git a/src/PHPCensor/Controller/UserController.php b/src/Controller/UserController.php similarity index 100% rename from src/PHPCensor/Controller/UserController.php rename to src/Controller/UserController.php diff --git a/src/PHPCensor/Controller/WebhookController.php b/src/Controller/WebhookController.php similarity index 100% rename from src/PHPCensor/Controller/WebhookController.php rename to src/Controller/WebhookController.php diff --git a/src/PHPCensor/Controller/WidgetAllProjectsController.php b/src/Controller/WidgetAllProjectsController.php similarity index 100% rename from src/PHPCensor/Controller/WidgetAllProjectsController.php rename to src/Controller/WidgetAllProjectsController.php diff --git a/src/PHPCensor/Controller/WidgetBuildErrorsController.php b/src/Controller/WidgetBuildErrorsController.php similarity index 100% rename from src/PHPCensor/Controller/WidgetBuildErrorsController.php rename to src/Controller/WidgetBuildErrorsController.php diff --git a/src/PHPCensor/Controller/WidgetLastBuildsController.php b/src/Controller/WidgetLastBuildsController.php similarity index 100% rename from src/PHPCensor/Controller/WidgetLastBuildsController.php rename to src/Controller/WidgetLastBuildsController.php diff --git a/src/PHPCensor/Database.php b/src/Database.php similarity index 100% rename from src/PHPCensor/Database.php rename to src/Database.php diff --git a/src/PHPCensor/Exception/HttpException.php b/src/Exception/HttpException.php similarity index 100% rename from src/PHPCensor/Exception/HttpException.php rename to src/Exception/HttpException.php diff --git a/src/PHPCensor/Exception/HttpException/BadRequestException.php b/src/Exception/HttpException/BadRequestException.php similarity index 100% rename from src/PHPCensor/Exception/HttpException/BadRequestException.php rename to src/Exception/HttpException/BadRequestException.php diff --git a/src/PHPCensor/Exception/HttpException/ForbiddenException.php b/src/Exception/HttpException/ForbiddenException.php similarity index 100% rename from src/PHPCensor/Exception/HttpException/ForbiddenException.php rename to src/Exception/HttpException/ForbiddenException.php diff --git a/src/PHPCensor/Exception/HttpException/NotAuthorizedException.php b/src/Exception/HttpException/NotAuthorizedException.php similarity index 100% rename from src/PHPCensor/Exception/HttpException/NotAuthorizedException.php rename to src/Exception/HttpException/NotAuthorizedException.php diff --git a/src/PHPCensor/Exception/HttpException/NotFoundException.php b/src/Exception/HttpException/NotFoundException.php similarity index 100% rename from src/PHPCensor/Exception/HttpException/NotFoundException.php rename to src/Exception/HttpException/NotFoundException.php diff --git a/src/PHPCensor/Exception/HttpException/ServerErrorException.php b/src/Exception/HttpException/ServerErrorException.php similarity index 100% rename from src/PHPCensor/Exception/HttpException/ServerErrorException.php rename to src/Exception/HttpException/ServerErrorException.php diff --git a/src/PHPCensor/Exception/HttpException/ValidationException.php b/src/Exception/HttpException/ValidationException.php similarity index 100% rename from src/PHPCensor/Exception/HttpException/ValidationException.php rename to src/Exception/HttpException/ValidationException.php diff --git a/src/PHPCensor/Form.php b/src/Form.php similarity index 100% rename from src/PHPCensor/Form.php rename to src/Form.php diff --git a/src/PHPCensor/Form/ControlGroup.php b/src/Form/ControlGroup.php similarity index 100% rename from src/PHPCensor/Form/ControlGroup.php rename to src/Form/ControlGroup.php diff --git a/src/PHPCensor/Form/Element.php b/src/Form/Element.php similarity index 92% rename from src/PHPCensor/Form/Element.php rename to src/Form/Element.php index dc9b742a..038260ad 100644 --- a/src/PHPCensor/Form/Element.php +++ b/src/Form/Element.php @@ -167,18 +167,12 @@ abstract class Element */ public function render($viewFile = null) { - $viewPath = SRC_DIR . 'View/'; - if (is_null($viewFile)) { $class = explode('\\', get_called_class()); $viewFile = end($class); } - if (file_exists($viewPath . 'Form/' . $viewFile . '.phtml')) { - $view = new View('Form/' . $viewFile); - } else { - $view = new View($viewFile, SRC_DIR . 'Form/View/'); - } + $view = new View('Form/' . $viewFile); $view->name = $this->getName(); $view->id = $this->getId(); diff --git a/src/PHPCensor/Form/Element/Button.php b/src/Form/Element/Button.php similarity index 100% rename from src/PHPCensor/Form/Element/Button.php rename to src/Form/Element/Button.php diff --git a/src/PHPCensor/Form/Element/Checkbox.php b/src/Form/Element/Checkbox.php similarity index 100% rename from src/PHPCensor/Form/Element/Checkbox.php rename to src/Form/Element/Checkbox.php diff --git a/src/PHPCensor/Form/Element/CheckboxGroup.php b/src/Form/Element/CheckboxGroup.php similarity index 100% rename from src/PHPCensor/Form/Element/CheckboxGroup.php rename to src/Form/Element/CheckboxGroup.php diff --git a/src/PHPCensor/Form/Element/Csrf.php b/src/Form/Element/Csrf.php similarity index 100% rename from src/PHPCensor/Form/Element/Csrf.php rename to src/Form/Element/Csrf.php diff --git a/src/PHPCensor/Form/Element/Email.php b/src/Form/Element/Email.php similarity index 100% rename from src/PHPCensor/Form/Element/Email.php rename to src/Form/Element/Email.php diff --git a/src/PHPCensor/Form/Element/Hidden.php b/src/Form/Element/Hidden.php similarity index 100% rename from src/PHPCensor/Form/Element/Hidden.php rename to src/Form/Element/Hidden.php diff --git a/src/PHPCensor/Form/Element/Password.php b/src/Form/Element/Password.php similarity index 100% rename from src/PHPCensor/Form/Element/Password.php rename to src/Form/Element/Password.php diff --git a/src/PHPCensor/Form/Element/Radio.php b/src/Form/Element/Radio.php similarity index 100% rename from src/PHPCensor/Form/Element/Radio.php rename to src/Form/Element/Radio.php diff --git a/src/PHPCensor/Form/Element/Select.php b/src/Form/Element/Select.php similarity index 100% rename from src/PHPCensor/Form/Element/Select.php rename to src/Form/Element/Select.php diff --git a/src/PHPCensor/Form/Element/Submit.php b/src/Form/Element/Submit.php similarity index 100% rename from src/PHPCensor/Form/Element/Submit.php rename to src/Form/Element/Submit.php diff --git a/src/PHPCensor/Form/Element/Text.php b/src/Form/Element/Text.php similarity index 100% rename from src/PHPCensor/Form/Element/Text.php rename to src/Form/Element/Text.php diff --git a/src/PHPCensor/Form/Element/TextArea.php b/src/Form/Element/TextArea.php similarity index 100% rename from src/PHPCensor/Form/Element/TextArea.php rename to src/Form/Element/TextArea.php diff --git a/src/PHPCensor/Form/Element/Url.php b/src/Form/Element/Url.php similarity index 100% rename from src/PHPCensor/Form/Element/Url.php rename to src/Form/Element/Url.php diff --git a/src/PHPCensor/Form/FieldSet.php b/src/Form/FieldSet.php similarity index 100% rename from src/PHPCensor/Form/FieldSet.php rename to src/Form/FieldSet.php diff --git a/src/PHPCensor/Form/Input.php b/src/Form/Input.php similarity index 100% rename from src/PHPCensor/Form/Input.php rename to src/Form/Input.php diff --git a/src/PHPCensor/Helper/AnsiConverter.php b/src/Helper/AnsiConverter.php similarity index 100% rename from src/PHPCensor/Helper/AnsiConverter.php rename to src/Helper/AnsiConverter.php diff --git a/src/PHPCensor/Helper/Bitbucket.php b/src/Helper/Bitbucket.php similarity index 100% rename from src/PHPCensor/Helper/Bitbucket.php rename to src/Helper/Bitbucket.php diff --git a/src/PHPCensor/Helper/Build.php b/src/Helper/Build.php similarity index 100% rename from src/PHPCensor/Helper/Build.php rename to src/Helper/Build.php diff --git a/src/PHPCensor/Helper/BuildInterpolator.php b/src/Helper/BuildInterpolator.php similarity index 100% rename from src/PHPCensor/Helper/BuildInterpolator.php rename to src/Helper/BuildInterpolator.php diff --git a/src/PHPCensor/Helper/CommandExecutor.php b/src/Helper/CommandExecutor.php similarity index 100% rename from src/PHPCensor/Helper/CommandExecutor.php rename to src/Helper/CommandExecutor.php diff --git a/src/PHPCensor/Helper/CommandExecutorInterface.php b/src/Helper/CommandExecutorInterface.php similarity index 100% rename from src/PHPCensor/Helper/CommandExecutorInterface.php rename to src/Helper/CommandExecutorInterface.php diff --git a/src/PHPCensor/Helper/Diff.php b/src/Helper/Diff.php similarity index 100% rename from src/PHPCensor/Helper/Diff.php rename to src/Helper/Diff.php diff --git a/src/PHPCensor/Helper/Email.php b/src/Helper/Email.php similarity index 100% rename from src/PHPCensor/Helper/Email.php rename to src/Helper/Email.php diff --git a/src/PHPCensor/Helper/Github.php b/src/Helper/Github.php similarity index 100% rename from src/PHPCensor/Helper/Github.php rename to src/Helper/Github.php diff --git a/src/PHPCensor/Helper/Lang.php b/src/Helper/Lang.php similarity index 100% rename from src/PHPCensor/Helper/Lang.php rename to src/Helper/Lang.php diff --git a/src/PHPCensor/Helper/MailerFactory.php b/src/Helper/MailerFactory.php similarity index 100% rename from src/PHPCensor/Helper/MailerFactory.php rename to src/Helper/MailerFactory.php diff --git a/src/PHPCensor/Helper/SshKey.php b/src/Helper/SshKey.php similarity index 100% rename from src/PHPCensor/Helper/SshKey.php rename to src/Helper/SshKey.php diff --git a/src/PHPCensor/Http/Request.php b/src/Http/Request.php similarity index 100% rename from src/PHPCensor/Http/Request.php rename to src/Http/Request.php diff --git a/src/PHPCensor/Http/Response.php b/src/Http/Response.php similarity index 100% rename from src/PHPCensor/Http/Response.php rename to src/Http/Response.php diff --git a/src/PHPCensor/Http/Response/JsonResponse.php b/src/Http/Response/JsonResponse.php similarity index 100% rename from src/PHPCensor/Http/Response/JsonResponse.php rename to src/Http/Response/JsonResponse.php diff --git a/src/PHPCensor/Http/Response/RedirectResponse.php b/src/Http/Response/RedirectResponse.php similarity index 100% rename from src/PHPCensor/Http/Response/RedirectResponse.php rename to src/Http/Response/RedirectResponse.php diff --git a/src/PHPCensor/Http/Router.php b/src/Http/Router.php similarity index 100% rename from src/PHPCensor/Http/Router.php rename to src/Http/Router.php diff --git a/src/PHPCensor/Languages/lang.da.php b/src/Languages/lang.da.php similarity index 100% rename from src/PHPCensor/Languages/lang.da.php rename to src/Languages/lang.da.php diff --git a/src/PHPCensor/Languages/lang.de.php b/src/Languages/lang.de.php similarity index 100% rename from src/PHPCensor/Languages/lang.de.php rename to src/Languages/lang.de.php diff --git a/src/PHPCensor/Languages/lang.el.php b/src/Languages/lang.el.php similarity index 100% rename from src/PHPCensor/Languages/lang.el.php rename to src/Languages/lang.el.php diff --git a/src/PHPCensor/Languages/lang.en.php b/src/Languages/lang.en.php similarity index 100% rename from src/PHPCensor/Languages/lang.en.php rename to src/Languages/lang.en.php diff --git a/src/PHPCensor/Languages/lang.es.php b/src/Languages/lang.es.php similarity index 100% rename from src/PHPCensor/Languages/lang.es.php rename to src/Languages/lang.es.php diff --git a/src/PHPCensor/Languages/lang.fr.php b/src/Languages/lang.fr.php similarity index 100% rename from src/PHPCensor/Languages/lang.fr.php rename to src/Languages/lang.fr.php diff --git a/src/PHPCensor/Languages/lang.it.php b/src/Languages/lang.it.php similarity index 100% rename from src/PHPCensor/Languages/lang.it.php rename to src/Languages/lang.it.php diff --git a/src/PHPCensor/Languages/lang.nl.php b/src/Languages/lang.nl.php similarity index 100% rename from src/PHPCensor/Languages/lang.nl.php rename to src/Languages/lang.nl.php diff --git a/src/PHPCensor/Languages/lang.pl.php b/src/Languages/lang.pl.php similarity index 100% rename from src/PHPCensor/Languages/lang.pl.php rename to src/Languages/lang.pl.php diff --git a/src/PHPCensor/Languages/lang.pt-br.php b/src/Languages/lang.pt-br.php similarity index 100% rename from src/PHPCensor/Languages/lang.pt-br.php rename to src/Languages/lang.pt-br.php diff --git a/src/PHPCensor/Languages/lang.ru.php b/src/Languages/lang.ru.php similarity index 100% rename from src/PHPCensor/Languages/lang.ru.php rename to src/Languages/lang.ru.php diff --git a/src/PHPCensor/Languages/lang.uk.php b/src/Languages/lang.uk.php similarity index 100% rename from src/PHPCensor/Languages/lang.uk.php rename to src/Languages/lang.uk.php diff --git a/src/PHPCensor/Languages/lang.zh.php b/src/Languages/lang.zh.php similarity index 100% rename from src/PHPCensor/Languages/lang.zh.php rename to src/Languages/lang.zh.php diff --git a/src/PHPCensor/Logging/BuildDBLogHandler.php b/src/Logging/BuildDBLogHandler.php similarity index 100% rename from src/PHPCensor/Logging/BuildDBLogHandler.php rename to src/Logging/BuildDBLogHandler.php diff --git a/src/PHPCensor/Logging/BuildLogger.php b/src/Logging/BuildLogger.php similarity index 100% rename from src/PHPCensor/Logging/BuildLogger.php rename to src/Logging/BuildLogger.php diff --git a/src/PHPCensor/Logging/Handler.php b/src/Logging/Handler.php similarity index 100% rename from src/PHPCensor/Logging/Handler.php rename to src/Logging/Handler.php diff --git a/src/PHPCensor/Logging/LoggedBuildContextTidier.php b/src/Logging/LoggedBuildContextTidier.php similarity index 100% rename from src/PHPCensor/Logging/LoggedBuildContextTidier.php rename to src/Logging/LoggedBuildContextTidier.php diff --git a/src/PHPCensor/Logging/OutputLogHandler.php b/src/Logging/OutputLogHandler.php similarity index 100% rename from src/PHPCensor/Logging/OutputLogHandler.php rename to src/Logging/OutputLogHandler.php diff --git a/src/PHPCensor/Migrations/20140513143726_initial_migration.php b/src/Migrations/20140513143726_initial_migration.php similarity index 100% rename from src/PHPCensor/Migrations/20140513143726_initial_migration.php rename to src/Migrations/20140513143726_initial_migration.php diff --git a/src/PHPCensor/Migrations/20140513153133_change_build_keys_migration.php b/src/Migrations/20140513153133_change_build_keys_migration.php similarity index 100% rename from src/PHPCensor/Migrations/20140513153133_change_build_keys_migration.php rename to src/Migrations/20140513153133_change_build_keys_migration.php diff --git a/src/PHPCensor/Migrations/20140611170618_choose_branch.php b/src/Migrations/20140611170618_choose_branch.php similarity index 100% rename from src/PHPCensor/Migrations/20140611170618_choose_branch.php rename to src/Migrations/20140611170618_choose_branch.php diff --git a/src/PHPCensor/Migrations/20140730143702_fix_database_columns.php b/src/Migrations/20140730143702_fix_database_columns.php similarity index 100% rename from src/PHPCensor/Migrations/20140730143702_fix_database_columns.php rename to src/Migrations/20140730143702_fix_database_columns.php diff --git a/src/PHPCensor/Migrations/20150131075425_archive_project.php b/src/Migrations/20150131075425_archive_project.php similarity index 100% rename from src/PHPCensor/Migrations/20150131075425_archive_project.php rename to src/Migrations/20150131075425_archive_project.php diff --git a/src/PHPCensor/Migrations/20150203105015_fix_column_types.php b/src/Migrations/20150203105015_fix_column_types.php similarity index 100% rename from src/PHPCensor/Migrations/20150203105015_fix_column_types.php rename to src/Migrations/20150203105015_fix_column_types.php diff --git a/src/PHPCensor/Migrations/20150308074509_add_user_providers.php b/src/Migrations/20150308074509_add_user_providers.php similarity index 100% rename from src/PHPCensor/Migrations/20150308074509_add_user_providers.php rename to src/Migrations/20150308074509_add_user_providers.php diff --git a/src/PHPCensor/Migrations/20150324174958_unique_email_and_name_user_fields.php b/src/Migrations/20150324174958_unique_email_and_name_user_fields.php similarity index 100% rename from src/PHPCensor/Migrations/20150324174958_unique_email_and_name_user_fields.php rename to src/Migrations/20150324174958_unique_email_and_name_user_fields.php diff --git a/src/PHPCensor/Migrations/20151008140800_add_project_groups.php b/src/Migrations/20151008140800_add_project_groups.php similarity index 100% rename from src/PHPCensor/Migrations/20151008140800_add_project_groups.php rename to src/Migrations/20151008140800_add_project_groups.php diff --git a/src/PHPCensor/Migrations/20151009100610_remove_unique_name_index.php b/src/Migrations/20151009100610_remove_unique_name_index.php similarity index 100% rename from src/PHPCensor/Migrations/20151009100610_remove_unique_name_index.php rename to src/Migrations/20151009100610_remove_unique_name_index.php diff --git a/src/PHPCensor/Migrations/20151014091859_errors_table.php b/src/Migrations/20151014091859_errors_table.php similarity index 100% rename from src/PHPCensor/Migrations/20151014091859_errors_table.php rename to src/Migrations/20151014091859_errors_table.php diff --git a/src/PHPCensor/Migrations/20151015124825_convert_errors.php b/src/Migrations/20151015124825_convert_errors.php similarity index 100% rename from src/PHPCensor/Migrations/20151015124825_convert_errors.php rename to src/Migrations/20151015124825_convert_errors.php diff --git a/src/PHPCensor/Migrations/20160425162114_branch_column_length.php b/src/Migrations/20160425162114_branch_column_length.php similarity index 100% rename from src/PHPCensor/Migrations/20160425162114_branch_column_length.php rename to src/Migrations/20160425162114_branch_column_length.php diff --git a/src/PHPCensor/Migrations/20160623100223_project_table_defaults.php b/src/Migrations/20160623100223_project_table_defaults.php similarity index 100% rename from src/PHPCensor/Migrations/20160623100223_project_table_defaults.php rename to src/Migrations/20160623100223_project_table_defaults.php diff --git a/src/PHPCensor/Migrations/20170103163312_added_language_and_per_page_for_user.php b/src/Migrations/20170103163312_added_language_and_per_page_for_user.php similarity index 100% rename from src/PHPCensor/Migrations/20170103163312_added_language_and_per_page_for_user.php rename to src/Migrations/20170103163312_added_language_and_per_page_for_user.php diff --git a/src/PHPCensor/Migrations/20170218175400_fixed_build_error_message_column.php b/src/Migrations/20170218175400_fixed_build_error_message_column.php similarity index 100% rename from src/PHPCensor/Migrations/20170218175400_fixed_build_error_message_column.php rename to src/Migrations/20170218175400_fixed_build_error_message_column.php diff --git a/src/PHPCensor/Migrations/20170223113127_fixed_build_log_column_for_mysql.php b/src/Migrations/20170223113127_fixed_build_log_column_for_mysql.php similarity index 100% rename from src/PHPCensor/Migrations/20170223113127_fixed_build_log_column_for_mysql.php rename to src/Migrations/20170223113127_fixed_build_log_column_for_mysql.php diff --git a/src/PHPCensor/Migrations/20170226132922_fixed_build_log_column_for_mysql2.php b/src/Migrations/20170226132922_fixed_build_log_column_for_mysql2.php similarity index 100% rename from src/PHPCensor/Migrations/20170226132922_fixed_build_log_column_for_mysql2.php rename to src/Migrations/20170226132922_fixed_build_log_column_for_mysql2.php diff --git a/src/PHPCensor/Migrations/20170321131931_add_environment.php b/src/Migrations/20170321131931_add_environment.php similarity index 100% rename from src/PHPCensor/Migrations/20170321131931_add_environment.php rename to src/Migrations/20170321131931_add_environment.php diff --git a/src/PHPCensor/Migrations/20170413131256_added_source_column_to_build_table.php b/src/Migrations/20170413131256_added_source_column_to_build_table.php similarity index 100% rename from src/PHPCensor/Migrations/20170413131256_added_source_column_to_build_table.php rename to src/Migrations/20170413131256_added_source_column_to_build_table.php diff --git a/src/PHPCensor/Migrations/20170416130610_fixed_environments.php b/src/Migrations/20170416130610_fixed_environments.php similarity index 100% rename from src/PHPCensor/Migrations/20170416130610_fixed_environments.php rename to src/Migrations/20170416130610_fixed_environments.php diff --git a/src/PHPCensor/Migrations/20170420142131_added_tag_column_to_build_table.php b/src/Migrations/20170420142131_added_tag_column_to_build_table.php similarity index 100% rename from src/PHPCensor/Migrations/20170420142131_added_tag_column_to_build_table.php rename to src/Migrations/20170420142131_added_tag_column_to_build_table.php diff --git a/src/PHPCensor/Migrations/20170711112805_fixed_build_meta_for_mysql.php b/src/Migrations/20170711112805_fixed_build_meta_for_mysql.php similarity index 100% rename from src/PHPCensor/Migrations/20170711112805_fixed_build_meta_for_mysql.php rename to src/Migrations/20170711112805_fixed_build_meta_for_mysql.php diff --git a/src/PHPCensor/Migrations/20170828142020_added_remember_me_login.php b/src/Migrations/20170828142020_added_remember_me_login.php similarity index 100% rename from src/PHPCensor/Migrations/20170828142020_added_remember_me_login.php rename to src/Migrations/20170828142020_added_remember_me_login.php diff --git a/src/PHPCensor/Migrations/20170913141438_added_default_branch_only.php b/src/Migrations/20170913141438_added_default_branch_only.php similarity index 100% rename from src/PHPCensor/Migrations/20170913141438_added_default_branch_only.php rename to src/Migrations/20170913141438_added_default_branch_only.php diff --git a/src/PHPCensor/Migrations/20171014173348_removed_project_id_from_build_meta.php b/src/Migrations/20171014173348_removed_project_id_from_build_meta.php similarity index 100% rename from src/PHPCensor/Migrations/20171014173348_removed_project_id_from_build_meta.php rename to src/Migrations/20171014173348_removed_project_id_from_build_meta.php diff --git a/src/PHPCensor/Migrations/20171015123827_added_additional_columns.php b/src/Migrations/20171015123827_added_additional_columns.php similarity index 100% rename from src/PHPCensor/Migrations/20171015123827_added_additional_columns.php rename to src/Migrations/20171015123827_added_additional_columns.php diff --git a/src/PHPCensor/Migrations/20171016143000_added_additional_columns2.php b/src/Migrations/20171016143000_added_additional_columns2.php similarity index 100% rename from src/PHPCensor/Migrations/20171016143000_added_additional_columns2.php rename to src/Migrations/20171016143000_added_additional_columns2.php diff --git a/src/PHPCensor/Migrations/20171019143346_added_additional_columns3.php b/src/Migrations/20171019143346_added_additional_columns3.php similarity index 100% rename from src/PHPCensor/Migrations/20171019143346_added_additional_columns3.php rename to src/Migrations/20171019143346_added_additional_columns3.php diff --git a/src/PHPCensor/Migrations/20171209135004_added_new_label_for_errors.php b/src/Migrations/20171209135004_added_new_label_for_errors.php similarity index 100% rename from src/PHPCensor/Migrations/20171209135004_added_new_label_for_errors.php rename to src/Migrations/20171209135004_added_new_label_for_errors.php diff --git a/src/PHPCensor/Migrations/20180223052715_added_request_branch_to_build.php b/src/Migrations/20180223052715_added_request_branch_to_build.php similarity index 100% rename from src/PHPCensor/Migrations/20180223052715_added_request_branch_to_build.php rename to src/Migrations/20180223052715_added_request_branch_to_build.php diff --git a/src/PHPCensor/Migrations/20180228024622_renamed_build_types.php b/src/Migrations/20180228024622_renamed_build_types.php similarity index 100% rename from src/PHPCensor/Migrations/20180228024622_renamed_build_types.php rename to src/Migrations/20180228024622_renamed_build_types.php diff --git a/src/PHPCensor/Model.php b/src/Model.php similarity index 100% rename from src/PHPCensor/Model.php rename to src/Model.php diff --git a/src/PHPCensor/Model/Build.php b/src/Model/Build.php similarity index 100% rename from src/PHPCensor/Model/Build.php rename to src/Model/Build.php diff --git a/src/PHPCensor/Model/Build/BitbucketBuild.php b/src/Model/Build/BitbucketBuild.php similarity index 100% rename from src/PHPCensor/Model/Build/BitbucketBuild.php rename to src/Model/Build/BitbucketBuild.php diff --git a/src/PHPCensor/Model/Build/BitbucketHgBuild.php b/src/Model/Build/BitbucketHgBuild.php similarity index 100% rename from src/PHPCensor/Model/Build/BitbucketHgBuild.php rename to src/Model/Build/BitbucketHgBuild.php diff --git a/src/PHPCensor/Model/Build/GitBuild.php b/src/Model/Build/GitBuild.php similarity index 100% rename from src/PHPCensor/Model/Build/GitBuild.php rename to src/Model/Build/GitBuild.php diff --git a/src/PHPCensor/Model/Build/GithubBuild.php b/src/Model/Build/GithubBuild.php similarity index 100% rename from src/PHPCensor/Model/Build/GithubBuild.php rename to src/Model/Build/GithubBuild.php diff --git a/src/PHPCensor/Model/Build/GitlabBuild.php b/src/Model/Build/GitlabBuild.php similarity index 100% rename from src/PHPCensor/Model/Build/GitlabBuild.php rename to src/Model/Build/GitlabBuild.php diff --git a/src/PHPCensor/Model/Build/GogsBuild.php b/src/Model/Build/GogsBuild.php similarity index 100% rename from src/PHPCensor/Model/Build/GogsBuild.php rename to src/Model/Build/GogsBuild.php diff --git a/src/PHPCensor/Model/Build/HgBuild.php b/src/Model/Build/HgBuild.php similarity index 100% rename from src/PHPCensor/Model/Build/HgBuild.php rename to src/Model/Build/HgBuild.php diff --git a/src/PHPCensor/Model/Build/LocalBuild.php b/src/Model/Build/LocalBuild.php similarity index 100% rename from src/PHPCensor/Model/Build/LocalBuild.php rename to src/Model/Build/LocalBuild.php diff --git a/src/PHPCensor/Model/Build/SvnBuild.php b/src/Model/Build/SvnBuild.php similarity index 100% rename from src/PHPCensor/Model/Build/SvnBuild.php rename to src/Model/Build/SvnBuild.php diff --git a/src/PHPCensor/Model/BuildError.php b/src/Model/BuildError.php similarity index 100% rename from src/PHPCensor/Model/BuildError.php rename to src/Model/BuildError.php diff --git a/src/PHPCensor/Model/BuildMeta.php b/src/Model/BuildMeta.php similarity index 100% rename from src/PHPCensor/Model/BuildMeta.php rename to src/Model/BuildMeta.php diff --git a/src/PHPCensor/Model/Environment.php b/src/Model/Environment.php similarity index 100% rename from src/PHPCensor/Model/Environment.php rename to src/Model/Environment.php diff --git a/src/PHPCensor/Model/Project.php b/src/Model/Project.php similarity index 100% rename from src/PHPCensor/Model/Project.php rename to src/Model/Project.php diff --git a/src/PHPCensor/Model/ProjectGroup.php b/src/Model/ProjectGroup.php similarity index 100% rename from src/PHPCensor/Model/ProjectGroup.php rename to src/Model/ProjectGroup.php diff --git a/src/PHPCensor/Model/User.php b/src/Model/User.php similarity index 100% rename from src/PHPCensor/Model/User.php rename to src/Model/User.php diff --git a/src/PHPCensor/Plugin.php b/src/Plugin.php similarity index 100% rename from src/PHPCensor/Plugin.php rename to src/Plugin.php diff --git a/src/PHPCensor/Plugin/Atoum.php b/src/Plugin/Atoum.php similarity index 100% rename from src/PHPCensor/Plugin/Atoum.php rename to src/Plugin/Atoum.php diff --git a/src/PHPCensor/Plugin/Behat.php b/src/Plugin/Behat.php similarity index 100% rename from src/PHPCensor/Plugin/Behat.php rename to src/Plugin/Behat.php diff --git a/src/PHPCensor/Plugin/Campfire.php b/src/Plugin/Campfire.php similarity index 100% rename from src/PHPCensor/Plugin/Campfire.php rename to src/Plugin/Campfire.php diff --git a/src/PHPCensor/Plugin/CleanBuild.php b/src/Plugin/CleanBuild.php similarity index 100% rename from src/PHPCensor/Plugin/CleanBuild.php rename to src/Plugin/CleanBuild.php diff --git a/src/PHPCensor/Plugin/Codeception.php b/src/Plugin/Codeception.php similarity index 100% rename from src/PHPCensor/Plugin/Codeception.php rename to src/Plugin/Codeception.php diff --git a/src/PHPCensor/Plugin/Composer.php b/src/Plugin/Composer.php similarity index 100% rename from src/PHPCensor/Plugin/Composer.php rename to src/Plugin/Composer.php diff --git a/src/PHPCensor/Plugin/CopyBuild.php b/src/Plugin/CopyBuild.php similarity index 100% rename from src/PHPCensor/Plugin/CopyBuild.php rename to src/Plugin/CopyBuild.php diff --git a/src/PHPCensor/Plugin/Deployer.php b/src/Plugin/Deployer.php similarity index 100% rename from src/PHPCensor/Plugin/Deployer.php rename to src/Plugin/Deployer.php diff --git a/src/PHPCensor/Plugin/Email.php b/src/Plugin/Email.php similarity index 100% rename from src/PHPCensor/Plugin/Email.php rename to src/Plugin/Email.php diff --git a/src/PHPCensor/Plugin/Env.php b/src/Plugin/Env.php similarity index 100% rename from src/PHPCensor/Plugin/Env.php rename to src/Plugin/Env.php diff --git a/src/PHPCensor/Plugin/FlowdockNotify.php b/src/Plugin/FlowdockNotify.php similarity index 100% rename from src/PHPCensor/Plugin/FlowdockNotify.php rename to src/Plugin/FlowdockNotify.php diff --git a/src/PHPCensor/Plugin/Git.php b/src/Plugin/Git.php similarity index 100% rename from src/PHPCensor/Plugin/Git.php rename to src/Plugin/Git.php diff --git a/src/PHPCensor/Plugin/Grunt.php b/src/Plugin/Grunt.php similarity index 100% rename from src/PHPCensor/Plugin/Grunt.php rename to src/Plugin/Grunt.php diff --git a/src/PHPCensor/Plugin/Gulp.php b/src/Plugin/Gulp.php similarity index 100% rename from src/PHPCensor/Plugin/Gulp.php rename to src/Plugin/Gulp.php diff --git a/src/PHPCensor/Plugin/HipchatNotify.php b/src/Plugin/HipchatNotify.php similarity index 100% rename from src/PHPCensor/Plugin/HipchatNotify.php rename to src/Plugin/HipchatNotify.php diff --git a/src/PHPCensor/Plugin/Irc.php b/src/Plugin/Irc.php similarity index 100% rename from src/PHPCensor/Plugin/Irc.php rename to src/Plugin/Irc.php diff --git a/src/PHPCensor/Plugin/Lint.php b/src/Plugin/Lint.php similarity index 100% rename from src/PHPCensor/Plugin/Lint.php rename to src/Plugin/Lint.php diff --git a/src/PHPCensor/Plugin/Mage.php b/src/Plugin/Mage.php similarity index 100% rename from src/PHPCensor/Plugin/Mage.php rename to src/Plugin/Mage.php diff --git a/src/PHPCensor/Plugin/Mage3.php b/src/Plugin/Mage3.php similarity index 100% rename from src/PHPCensor/Plugin/Mage3.php rename to src/Plugin/Mage3.php diff --git a/src/PHPCensor/Plugin/Mysql.php b/src/Plugin/Mysql.php similarity index 100% rename from src/PHPCensor/Plugin/Mysql.php rename to src/Plugin/Mysql.php diff --git a/src/PHPCensor/Plugin/Option/PhpUnitOptions.php b/src/Plugin/Option/PhpUnitOptions.php similarity index 100% rename from src/PHPCensor/Plugin/Option/PhpUnitOptions.php rename to src/Plugin/Option/PhpUnitOptions.php diff --git a/src/PHPCensor/Plugin/PackageBuild.php b/src/Plugin/PackageBuild.php similarity index 100% rename from src/PHPCensor/Plugin/PackageBuild.php rename to src/Plugin/PackageBuild.php diff --git a/src/PHPCensor/Plugin/Pdepend.php b/src/Plugin/Pdepend.php similarity index 100% rename from src/PHPCensor/Plugin/Pdepend.php rename to src/Plugin/Pdepend.php diff --git a/src/PHPCensor/Plugin/Pgsql.php b/src/Plugin/Pgsql.php similarity index 100% rename from src/PHPCensor/Plugin/Pgsql.php rename to src/Plugin/Pgsql.php diff --git a/src/PHPCensor/Plugin/Phar.php b/src/Plugin/Phar.php similarity index 100% rename from src/PHPCensor/Plugin/Phar.php rename to src/Plugin/Phar.php diff --git a/src/PHPCensor/Plugin/Phing.php b/src/Plugin/Phing.php similarity index 100% rename from src/PHPCensor/Plugin/Phing.php rename to src/Plugin/Phing.php diff --git a/src/PHPCensor/Plugin/PhpCodeSniffer.php b/src/Plugin/PhpCodeSniffer.php similarity index 100% rename from src/PHPCensor/Plugin/PhpCodeSniffer.php rename to src/Plugin/PhpCodeSniffer.php diff --git a/src/PHPCensor/Plugin/PhpCpd.php b/src/Plugin/PhpCpd.php similarity index 100% rename from src/PHPCensor/Plugin/PhpCpd.php rename to src/Plugin/PhpCpd.php diff --git a/src/PHPCensor/Plugin/PhpCsFixer.php b/src/Plugin/PhpCsFixer.php similarity index 100% rename from src/PHPCensor/Plugin/PhpCsFixer.php rename to src/Plugin/PhpCsFixer.php diff --git a/src/PHPCensor/Plugin/PhpDocblockChecker.php b/src/Plugin/PhpDocblockChecker.php similarity index 100% rename from src/PHPCensor/Plugin/PhpDocblockChecker.php rename to src/Plugin/PhpDocblockChecker.php diff --git a/src/PHPCensor/Plugin/PhpLoc.php b/src/Plugin/PhpLoc.php similarity index 100% rename from src/PHPCensor/Plugin/PhpLoc.php rename to src/Plugin/PhpLoc.php diff --git a/src/PHPCensor/Plugin/PhpMessDetector.php b/src/Plugin/PhpMessDetector.php similarity index 100% rename from src/PHPCensor/Plugin/PhpMessDetector.php rename to src/Plugin/PhpMessDetector.php diff --git a/src/PHPCensor/Plugin/PhpParallelLint.php b/src/Plugin/PhpParallelLint.php similarity index 100% rename from src/PHPCensor/Plugin/PhpParallelLint.php rename to src/Plugin/PhpParallelLint.php diff --git a/src/PHPCensor/Plugin/PhpSpec.php b/src/Plugin/PhpSpec.php similarity index 100% rename from src/PHPCensor/Plugin/PhpSpec.php rename to src/Plugin/PhpSpec.php diff --git a/src/PHPCensor/Plugin/PhpTalLint.php b/src/Plugin/PhpTalLint.php similarity index 98% rename from src/PHPCensor/Plugin/PhpTalLint.php rename to src/Plugin/PhpTalLint.php index 636df1e2..1f2c784d 100644 --- a/src/PHPCensor/Plugin/PhpTalLint.php +++ b/src/Plugin/PhpTalLint.php @@ -9,7 +9,7 @@ use PHPCensor\Plugin; /** * PHPTAL Lint Plugin - Provides access to PHPTAL lint functionality. - * + * * @author Stephen Ball */ class PhpTalLint extends Plugin @@ -174,7 +174,7 @@ class PhpTalLint extends Plugin list($suffixes, $tales) = $this->getFlags(); - $lint = __DIR__ . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR; + $lint = __DIR__ . DIRECTORY_SEPARATOR . DIRECTORY_SEPARATOR; $lint .= 'vendor' . DIRECTORY_SEPARATOR . 'phptal' . DIRECTORY_SEPARATOR . 'phptal' . DIRECTORY_SEPARATOR; $lint .= 'tools' . DIRECTORY_SEPARATOR . 'phptal_lint.php'; $cmd = '/usr/bin/env php ' . $lint . ' %s %s "%s"'; diff --git a/src/PHPCensor/Plugin/PhpUnit.php b/src/Plugin/PhpUnit.php similarity index 100% rename from src/PHPCensor/Plugin/PhpUnit.php rename to src/Plugin/PhpUnit.php diff --git a/src/PHPCensor/Plugin/SecurityChecker.php b/src/Plugin/SecurityChecker.php similarity index 100% rename from src/PHPCensor/Plugin/SecurityChecker.php rename to src/Plugin/SecurityChecker.php diff --git a/src/PHPCensor/Plugin/Shell.php b/src/Plugin/Shell.php similarity index 100% rename from src/PHPCensor/Plugin/Shell.php rename to src/Plugin/Shell.php diff --git a/src/PHPCensor/Plugin/SlackNotify.php b/src/Plugin/SlackNotify.php similarity index 100% rename from src/PHPCensor/Plugin/SlackNotify.php rename to src/Plugin/SlackNotify.php diff --git a/src/PHPCensor/Plugin/Sqlite.php b/src/Plugin/Sqlite.php similarity index 100% rename from src/PHPCensor/Plugin/Sqlite.php rename to src/Plugin/Sqlite.php diff --git a/src/PHPCensor/Plugin/TechnicalDebt.php b/src/Plugin/TechnicalDebt.php similarity index 100% rename from src/PHPCensor/Plugin/TechnicalDebt.php rename to src/Plugin/TechnicalDebt.php diff --git a/src/PHPCensor/Plugin/Util/Executor.php b/src/Plugin/Util/Executor.php similarity index 100% rename from src/PHPCensor/Plugin/Util/Executor.php rename to src/Plugin/Util/Executor.php diff --git a/src/PHPCensor/Plugin/Util/Factory.php b/src/Plugin/Util/Factory.php similarity index 100% rename from src/PHPCensor/Plugin/Util/Factory.php rename to src/Plugin/Util/Factory.php diff --git a/src/PHPCensor/Plugin/Util/PhpUnitResult.php b/src/Plugin/Util/PhpUnitResult.php similarity index 100% rename from src/PHPCensor/Plugin/Util/PhpUnitResult.php rename to src/Plugin/Util/PhpUnitResult.php diff --git a/src/PHPCensor/Plugin/Util/PhpUnitResultJson.php b/src/Plugin/Util/PhpUnitResultJson.php similarity index 100% rename from src/PHPCensor/Plugin/Util/PhpUnitResultJson.php rename to src/Plugin/Util/PhpUnitResultJson.php diff --git a/src/PHPCensor/Plugin/Util/PhpUnitResultJunit.php b/src/Plugin/Util/PhpUnitResultJunit.php similarity index 100% rename from src/PHPCensor/Plugin/Util/PhpUnitResultJunit.php rename to src/Plugin/Util/PhpUnitResultJunit.php diff --git a/src/PHPCensor/Plugin/Util/TestResultParsers/Codeception.php b/src/Plugin/Util/TestResultParsers/Codeception.php similarity index 100% rename from src/PHPCensor/Plugin/Util/TestResultParsers/Codeception.php rename to src/Plugin/Util/TestResultParsers/Codeception.php diff --git a/src/PHPCensor/Plugin/Util/TestResultParsers/ParserInterface.php b/src/Plugin/Util/TestResultParsers/ParserInterface.php similarity index 100% rename from src/PHPCensor/Plugin/Util/TestResultParsers/ParserInterface.php rename to src/Plugin/Util/TestResultParsers/ParserInterface.php diff --git a/src/PHPCensor/Plugin/Wipe.php b/src/Plugin/Wipe.php similarity index 100% rename from src/PHPCensor/Plugin/Wipe.php rename to src/Plugin/Wipe.php diff --git a/src/PHPCensor/Plugin/Xmpp.php b/src/Plugin/Xmpp.php similarity index 100% rename from src/PHPCensor/Plugin/Xmpp.php rename to src/Plugin/Xmpp.php diff --git a/src/PHPCensor/ProcessControl/Factory.php b/src/ProcessControl/Factory.php similarity index 100% rename from src/PHPCensor/ProcessControl/Factory.php rename to src/ProcessControl/Factory.php diff --git a/src/PHPCensor/ProcessControl/PosixProcessControl.php b/src/ProcessControl/PosixProcessControl.php similarity index 100% rename from src/PHPCensor/ProcessControl/PosixProcessControl.php rename to src/ProcessControl/PosixProcessControl.php diff --git a/src/PHPCensor/ProcessControl/ProcessControlInterface.php b/src/ProcessControl/ProcessControlInterface.php similarity index 100% rename from src/PHPCensor/ProcessControl/ProcessControlInterface.php rename to src/ProcessControl/ProcessControlInterface.php diff --git a/src/PHPCensor/ProcessControl/UnixProcessControl.php b/src/ProcessControl/UnixProcessControl.php similarity index 100% rename from src/PHPCensor/ProcessControl/UnixProcessControl.php rename to src/ProcessControl/UnixProcessControl.php diff --git a/src/PHPCensor/Security/Authentication/LoginPasswordProviderInterface.php b/src/Security/Authentication/LoginPasswordProviderInterface.php similarity index 100% rename from src/PHPCensor/Security/Authentication/LoginPasswordProviderInterface.php rename to src/Security/Authentication/LoginPasswordProviderInterface.php diff --git a/src/PHPCensor/Security/Authentication/Service.php b/src/Security/Authentication/Service.php similarity index 100% rename from src/PHPCensor/Security/Authentication/Service.php rename to src/Security/Authentication/Service.php diff --git a/src/PHPCensor/Security/Authentication/UserProvider/AbstractProvider.php b/src/Security/Authentication/UserProvider/AbstractProvider.php similarity index 100% rename from src/PHPCensor/Security/Authentication/UserProvider/AbstractProvider.php rename to src/Security/Authentication/UserProvider/AbstractProvider.php diff --git a/src/PHPCensor/Security/Authentication/UserProvider/Internal.php b/src/Security/Authentication/UserProvider/Internal.php similarity index 100% rename from src/PHPCensor/Security/Authentication/UserProvider/Internal.php rename to src/Security/Authentication/UserProvider/Internal.php diff --git a/src/PHPCensor/Security/Authentication/UserProvider/Ldap.php b/src/Security/Authentication/UserProvider/Ldap.php similarity index 100% rename from src/PHPCensor/Security/Authentication/UserProvider/Ldap.php rename to src/Security/Authentication/UserProvider/Ldap.php diff --git a/src/PHPCensor/Security/Authentication/UserProviderInterface.php b/src/Security/Authentication/UserProviderInterface.php similarity index 100% rename from src/PHPCensor/Security/Authentication/UserProviderInterface.php rename to src/Security/Authentication/UserProviderInterface.php diff --git a/src/PHPCensor/Service/BuildService.php b/src/Service/BuildService.php similarity index 100% rename from src/PHPCensor/Service/BuildService.php rename to src/Service/BuildService.php diff --git a/src/PHPCensor/Service/BuildStatusService.php b/src/Service/BuildStatusService.php similarity index 100% rename from src/PHPCensor/Service/BuildStatusService.php rename to src/Service/BuildStatusService.php diff --git a/src/PHPCensor/Service/ProjectService.php b/src/Service/ProjectService.php similarity index 100% rename from src/PHPCensor/Service/ProjectService.php rename to src/Service/ProjectService.php diff --git a/src/PHPCensor/Service/UserService.php b/src/Service/UserService.php similarity index 100% rename from src/PHPCensor/Service/UserService.php rename to src/Service/UserService.php diff --git a/src/PHPCensor/Store.php b/src/Store.php similarity index 100% rename from src/PHPCensor/Store.php rename to src/Store.php diff --git a/src/PHPCensor/Store/BuildErrorStore.php b/src/Store/BuildErrorStore.php similarity index 100% rename from src/PHPCensor/Store/BuildErrorStore.php rename to src/Store/BuildErrorStore.php diff --git a/src/PHPCensor/Store/BuildErrorWriter.php b/src/Store/BuildErrorWriter.php similarity index 100% rename from src/PHPCensor/Store/BuildErrorWriter.php rename to src/Store/BuildErrorWriter.php diff --git a/src/PHPCensor/Store/BuildMetaStore.php b/src/Store/BuildMetaStore.php similarity index 100% rename from src/PHPCensor/Store/BuildMetaStore.php rename to src/Store/BuildMetaStore.php diff --git a/src/PHPCensor/Store/BuildStore.php b/src/Store/BuildStore.php similarity index 100% rename from src/PHPCensor/Store/BuildStore.php rename to src/Store/BuildStore.php diff --git a/src/PHPCensor/Store/EnvironmentStore.php b/src/Store/EnvironmentStore.php similarity index 100% rename from src/PHPCensor/Store/EnvironmentStore.php rename to src/Store/EnvironmentStore.php diff --git a/src/PHPCensor/Store/Factory.php b/src/Store/Factory.php similarity index 100% rename from src/PHPCensor/Store/Factory.php rename to src/Store/Factory.php diff --git a/src/PHPCensor/Store/ProjectGroupStore.php b/src/Store/ProjectGroupStore.php similarity index 100% rename from src/PHPCensor/Store/ProjectGroupStore.php rename to src/Store/ProjectGroupStore.php diff --git a/src/PHPCensor/Store/ProjectStore.php b/src/Store/ProjectStore.php similarity index 100% rename from src/PHPCensor/Store/ProjectStore.php rename to src/Store/ProjectStore.php diff --git a/src/PHPCensor/Store/UserStore.php b/src/Store/UserStore.php similarity index 100% rename from src/PHPCensor/Store/UserStore.php rename to src/Store/UserStore.php diff --git a/src/PHPCensor/View.php b/src/View.php similarity index 100% rename from src/PHPCensor/View.php rename to src/View.php diff --git a/src/PHPCensor/View/Build/errors.phtml b/src/View/Build/errors.phtml similarity index 100% rename from src/PHPCensor/View/Build/errors.phtml rename to src/View/Build/errors.phtml diff --git a/src/PHPCensor/View/Build/header-row.phtml b/src/View/Build/header-row.phtml similarity index 100% rename from src/PHPCensor/View/Build/header-row.phtml rename to src/View/Build/header-row.phtml diff --git a/src/PHPCensor/View/Build/view.phtml b/src/View/Build/view.phtml similarity index 100% rename from src/PHPCensor/View/Build/view.phtml rename to src/View/Build/view.phtml diff --git a/src/PHPCensor/View/BuildStatus/view.phtml b/src/View/BuildStatus/view.phtml similarity index 100% rename from src/PHPCensor/View/BuildStatus/view.phtml rename to src/View/BuildStatus/view.phtml diff --git a/src/PHPCensor/View/Email/layout.phtml b/src/View/Email/layout.phtml similarity index 93% rename from src/PHPCensor/View/Email/layout.phtml rename to src/View/Email/layout.phtml index a97ac991..b4fbad83 100644 --- a/src/PHPCensor/View/Email/layout.phtml +++ b/src/View/Email/layout.phtml @@ -1,7 +1,7 @@ diff --git a/src/PHPCensor/View/Email/long.phtml b/src/View/Email/long.phtml similarity index 100% rename from src/PHPCensor/View/Email/long.phtml rename to src/View/Email/long.phtml diff --git a/src/PHPCensor/View/Email/short.phtml b/src/View/Email/short.phtml similarity index 100% rename from src/PHPCensor/View/Email/short.phtml rename to src/View/Email/short.phtml diff --git a/src/PHPCensor/Form/View/Button.phtml b/src/View/Form/Button.phtml similarity index 100% rename from src/PHPCensor/Form/View/Button.phtml rename to src/View/Form/Button.phtml diff --git a/src/PHPCensor/Form/View/Checkbox.phtml b/src/View/Form/Checkbox.phtml similarity index 100% rename from src/PHPCensor/Form/View/Checkbox.phtml rename to src/View/Form/Checkbox.phtml diff --git a/src/PHPCensor/Form/View/CheckboxGroup.phtml b/src/View/Form/CheckboxGroup.phtml similarity index 100% rename from src/PHPCensor/Form/View/CheckboxGroup.phtml rename to src/View/Form/CheckboxGroup.phtml diff --git a/src/PHPCensor/Form/View/ControlGroup.phtml b/src/View/Form/ControlGroup.phtml similarity index 100% rename from src/PHPCensor/Form/View/ControlGroup.phtml rename to src/View/Form/ControlGroup.phtml diff --git a/src/PHPCensor/Form/View/Csrf.phtml b/src/View/Form/Csrf.phtml similarity index 100% rename from src/PHPCensor/Form/View/Csrf.phtml rename to src/View/Form/Csrf.phtml diff --git a/src/PHPCensor/Form/View/FieldSet.phtml b/src/View/Form/FieldSet.phtml similarity index 100% rename from src/PHPCensor/Form/View/FieldSet.phtml rename to src/View/Form/FieldSet.phtml diff --git a/src/PHPCensor/Form/View/Form.phtml b/src/View/Form/Form.phtml similarity index 100% rename from src/PHPCensor/Form/View/Form.phtml rename to src/View/Form/Form.phtml diff --git a/src/PHPCensor/Form/View/Hidden.phtml b/src/View/Form/Hidden.phtml similarity index 100% rename from src/PHPCensor/Form/View/Hidden.phtml rename to src/View/Form/Hidden.phtml diff --git a/src/PHPCensor/Form/View/Radio.phtml b/src/View/Form/Radio.phtml similarity index 100% rename from src/PHPCensor/Form/View/Radio.phtml rename to src/View/Form/Radio.phtml diff --git a/src/PHPCensor/Form/View/Select.phtml b/src/View/Form/Select.phtml similarity index 100% rename from src/PHPCensor/Form/View/Select.phtml rename to src/View/Form/Select.phtml diff --git a/src/PHPCensor/Form/View/Text.phtml b/src/View/Form/Text.phtml similarity index 100% rename from src/PHPCensor/Form/View/Text.phtml rename to src/View/Form/Text.phtml diff --git a/src/PHPCensor/Form/View/TextArea.phtml b/src/View/Form/TextArea.phtml similarity index 100% rename from src/PHPCensor/Form/View/TextArea.phtml rename to src/View/Form/TextArea.phtml diff --git a/src/PHPCensor/View/Group/edit.phtml b/src/View/Group/edit.phtml similarity index 100% rename from src/PHPCensor/View/Group/edit.phtml rename to src/View/Group/edit.phtml diff --git a/src/PHPCensor/View/Group/index.phtml b/src/View/Group/index.phtml similarity index 100% rename from src/PHPCensor/View/Group/index.phtml rename to src/View/Group/index.phtml diff --git a/src/PHPCensor/View/Home/index.phtml b/src/View/Home/index.phtml similarity index 100% rename from src/PHPCensor/View/Home/index.phtml rename to src/View/Home/index.phtml diff --git a/src/PHPCensor/View/Project/ajax-builds.phtml b/src/View/Project/ajax-builds.phtml similarity index 100% rename from src/PHPCensor/View/Project/ajax-builds.phtml rename to src/View/Project/ajax-builds.phtml diff --git a/src/PHPCensor/View/Project/edit.phtml b/src/View/Project/edit.phtml similarity index 100% rename from src/PHPCensor/View/Project/edit.phtml rename to src/View/Project/edit.phtml diff --git a/src/PHPCensor/View/Project/view.phtml b/src/View/Project/view.phtml similarity index 100% rename from src/PHPCensor/View/Project/view.phtml rename to src/View/Project/view.phtml diff --git a/src/PHPCensor/View/Session.phtml b/src/View/Session.phtml similarity index 100% rename from src/PHPCensor/View/Session.phtml rename to src/View/Session.phtml diff --git a/src/PHPCensor/View/Session/forgotPassword.phtml b/src/View/Session/forgotPassword.phtml similarity index 100% rename from src/PHPCensor/View/Session/forgotPassword.phtml rename to src/View/Session/forgotPassword.phtml diff --git a/src/PHPCensor/View/Session/login.phtml b/src/View/Session/login.phtml similarity index 100% rename from src/PHPCensor/View/Session/login.phtml rename to src/View/Session/login.phtml diff --git a/src/PHPCensor/View/Session/resetPassword.phtml b/src/View/Session/resetPassword.phtml similarity index 100% rename from src/PHPCensor/View/Session/resetPassword.phtml rename to src/View/Session/resetPassword.phtml diff --git a/src/PHPCensor/View/User/edit.phtml b/src/View/User/edit.phtml similarity index 100% rename from src/PHPCensor/View/User/edit.phtml rename to src/View/User/edit.phtml diff --git a/src/PHPCensor/View/User/index.phtml b/src/View/User/index.phtml similarity index 100% rename from src/PHPCensor/View/User/index.phtml rename to src/View/User/index.phtml diff --git a/src/PHPCensor/View/User/profile.phtml b/src/View/User/profile.phtml similarity index 100% rename from src/PHPCensor/View/User/profile.phtml rename to src/View/User/profile.phtml diff --git a/src/PHPCensor/View/WidgetAllProjects/index-projects.phtml b/src/View/WidgetAllProjects/index-projects.phtml similarity index 100% rename from src/PHPCensor/View/WidgetAllProjects/index-projects.phtml rename to src/View/WidgetAllProjects/index-projects.phtml diff --git a/src/PHPCensor/View/WidgetAllProjects/index.phtml b/src/View/WidgetAllProjects/index.phtml similarity index 100% rename from src/PHPCensor/View/WidgetAllProjects/index.phtml rename to src/View/WidgetAllProjects/index.phtml diff --git a/src/PHPCensor/View/WidgetAllProjects/update.phtml b/src/View/WidgetAllProjects/update.phtml similarity index 100% rename from src/PHPCensor/View/WidgetAllProjects/update.phtml rename to src/View/WidgetAllProjects/update.phtml diff --git a/src/PHPCensor/View/WidgetBuildErrors/empty.phtml b/src/View/WidgetBuildErrors/empty.phtml similarity index 100% rename from src/PHPCensor/View/WidgetBuildErrors/empty.phtml rename to src/View/WidgetBuildErrors/empty.phtml diff --git a/src/PHPCensor/View/WidgetBuildErrors/index.phtml b/src/View/WidgetBuildErrors/index.phtml similarity index 100% rename from src/PHPCensor/View/WidgetBuildErrors/index.phtml rename to src/View/WidgetBuildErrors/index.phtml diff --git a/src/PHPCensor/View/WidgetBuildErrors/update.phtml b/src/View/WidgetBuildErrors/update.phtml similarity index 100% rename from src/PHPCensor/View/WidgetBuildErrors/update.phtml rename to src/View/WidgetBuildErrors/update.phtml diff --git a/src/PHPCensor/View/WidgetLastBuilds/index.phtml b/src/View/WidgetLastBuilds/index.phtml similarity index 100% rename from src/PHPCensor/View/WidgetLastBuilds/index.phtml rename to src/View/WidgetLastBuilds/index.phtml diff --git a/src/PHPCensor/View/WidgetLastBuilds/update.phtml b/src/View/WidgetLastBuilds/update.phtml similarity index 100% rename from src/PHPCensor/View/WidgetLastBuilds/update.phtml rename to src/View/WidgetLastBuilds/update.phtml diff --git a/src/PHPCensor/View/exception.phtml b/src/View/exception.phtml similarity index 100% rename from src/PHPCensor/View/exception.phtml rename to src/View/exception.phtml diff --git a/src/PHPCensor/View/layout.phtml b/src/View/layout.phtml similarity index 100% rename from src/PHPCensor/View/layout.phtml rename to src/View/layout.phtml diff --git a/src/PHPCensor/View/pagination.phtml b/src/View/pagination.phtml similarity index 100% rename from src/PHPCensor/View/pagination.phtml rename to src/View/pagination.phtml diff --git a/src/PHPCensor/Worker/BuildWorker.php b/src/Worker/BuildWorker.php similarity index 100% rename from src/PHPCensor/Worker/BuildWorker.php rename to src/Worker/BuildWorker.php diff --git a/src/PHPCensor/ZeroConfigPluginInterface.php b/src/ZeroConfigPluginInterface.php similarity index 100% rename from src/PHPCensor/ZeroConfigPluginInterface.php rename to src/ZeroConfigPluginInterface.php diff --git a/tests/bootstrap.php b/tests/bootstrap.php index 906f8c5a..0783ef40 100644 --- a/tests/bootstrap.php +++ b/tests/bootstrap.php @@ -5,7 +5,7 @@ if (!defined('ROOT_DIR')) { } if (!defined('SRC_DIR')) { - define('SRC_DIR', ROOT_DIR . 'src/PHPCensor/'); + define('SRC_DIR', ROOT_DIR . 'src/'); } if (!defined('PUBLIC_DIR')) { diff --git a/tests/PHPCensor/Plugin/SampleFiles/invalid_format.txt b/tests/data/Plugin/PhpUnit/invalid_format.txt similarity index 100% rename from tests/PHPCensor/Plugin/SampleFiles/invalid_format.txt rename to tests/data/Plugin/PhpUnit/invalid_format.txt diff --git a/tests/PHPCensor/Plugin/SampleFiles/phpunit_money.txt b/tests/data/Plugin/PhpUnit/phpunit_money.txt similarity index 100% rename from tests/PHPCensor/Plugin/SampleFiles/phpunit_money.txt rename to tests/data/Plugin/PhpUnit/phpunit_money.txt diff --git a/tests/PHPCensor/Plugin/SampleFiles/phpunit_money_junit.xml b/tests/data/Plugin/PhpUnit/phpunit_money_junit.xml similarity index 100% rename from tests/PHPCensor/Plugin/SampleFiles/phpunit_money_junit.xml rename to tests/data/Plugin/PhpUnit/phpunit_money_junit.xml diff --git a/tests/PHPCensor/data/view/Form/form.phtml b/tests/data/View/Form/form.phtml similarity index 100% rename from tests/PHPCensor/data/view/Form/form.phtml rename to tests/data/View/Form/form.phtml diff --git a/tests/PHPCensor/data/view/simple.phtml b/tests/data/View/simple.phtml similarity index 100% rename from tests/PHPCensor/data/view/simple.phtml rename to tests/data/View/simple.phtml diff --git a/tests/PHPCensor/data/view/vars.phtml b/tests/data/View/vars.phtml similarity index 100% rename from tests/PHPCensor/data/view/vars.phtml rename to tests/data/View/vars.phtml diff --git a/tests/temp/.gitkeep b/tests/runtime/.gitkeep similarity index 100% rename from tests/temp/.gitkeep rename to tests/runtime/.gitkeep diff --git a/tests/PHPCensor/Command/CreateAdminCommandTest.php b/tests/src/Command/CreateAdminCommandTest.php similarity index 97% rename from tests/PHPCensor/Command/CreateAdminCommandTest.php rename to tests/src/Command/CreateAdminCommandTest.php index a4be00ec..7ec0877c 100644 --- a/tests/PHPCensor/Command/CreateAdminCommandTest.php +++ b/tests/src/Command/CreateAdminCommandTest.php @@ -1,6 +1,6 @@ mockFactory->buildPlugin($pluginNamespace . $pluginName, $options) - ->shouldBeCalledTimes(1) - ->willReturn($this->prophesize('PHPCensor\Plugin')->reveal()); + $this->mockFactory + ->buildPlugin($pluginNamespace . $pluginName, $options) + ->shouldBeCalledTimes(1) + ->willReturn($this->prophesize('PHPCensor\Plugin')->reveal()); $this->testedExecutor->executePlugin($pluginName, $options); } @@ -56,9 +57,10 @@ class ExecutorTest extends \PHPUnit\Framework\TestCase $options = []; $pluginClass = $this->getFakePluginClassName('ExamplePluginFull'); - $this->mockFactory->buildPlugin($pluginClass, $options) - ->shouldBeCalledTimes(1) - ->willReturn($this->prophesize('PHPCensor\Plugin')->reveal()); + $this->mockFactory + ->buildPlugin($pluginClass, $options) + ->shouldBeCalledTimes(1) + ->willReturn($this->prophesize('PHPCensor\Plugin')->reveal()); $this->testedExecutor->executePlugin($pluginClass, $options); } diff --git a/tests/PHPCensor/Plugin/Util/FactoryTest.php b/tests/src/Plugin/Util/FactoryTest.php similarity index 100% rename from tests/PHPCensor/Plugin/Util/FactoryTest.php rename to tests/src/Plugin/Util/FactoryTest.php diff --git a/tests/PHPCensor/Plugin/Util/Fake/ExamplePluginFull.php b/tests/src/Plugin/Util/Fake/ExamplePluginFull.php similarity index 100% rename from tests/PHPCensor/Plugin/Util/Fake/ExamplePluginFull.php rename to tests/src/Plugin/Util/Fake/ExamplePluginFull.php diff --git a/tests/PHPCensor/Plugin/Util/Fake/ExamplePluginWithNoConstructorArgs.php b/tests/src/Plugin/Util/Fake/ExamplePluginWithNoConstructorArgs.php similarity index 100% rename from tests/PHPCensor/Plugin/Util/Fake/ExamplePluginWithNoConstructorArgs.php rename to tests/src/Plugin/Util/Fake/ExamplePluginWithNoConstructorArgs.php diff --git a/tests/PHPCensor/Plugin/Util/Fake/ExamplePluginWithSingleOptionalArg.php b/tests/src/Plugin/Util/Fake/ExamplePluginWithSingleOptionalArg.php similarity index 100% rename from tests/PHPCensor/Plugin/Util/Fake/ExamplePluginWithSingleOptionalArg.php rename to tests/src/Plugin/Util/Fake/ExamplePluginWithSingleOptionalArg.php diff --git a/tests/PHPCensor/Plugin/Util/Fake/ExamplePluginWithSingleRequiredArg.php b/tests/src/Plugin/Util/Fake/ExamplePluginWithSingleRequiredArg.php similarity index 100% rename from tests/PHPCensor/Plugin/Util/Fake/ExamplePluginWithSingleRequiredArg.php rename to tests/src/Plugin/Util/Fake/ExamplePluginWithSingleRequiredArg.php diff --git a/tests/PHPCensor/Plugin/Util/Fake/ExamplePluginWithSingleTypedRequiredArg.php b/tests/src/Plugin/Util/Fake/ExamplePluginWithSingleTypedRequiredArg.php similarity index 100% rename from tests/PHPCensor/Plugin/Util/Fake/ExamplePluginWithSingleTypedRequiredArg.php rename to tests/src/Plugin/Util/Fake/ExamplePluginWithSingleTypedRequiredArg.php diff --git a/tests/PHPCensor/Plugin/Util/PhpUnitResultTest.php b/tests/src/Plugin/Util/PhpUnitResultTest.php similarity index 93% rename from tests/PHPCensor/Plugin/Util/PhpUnitResultTest.php rename to tests/src/Plugin/Util/PhpUnitResultTest.php index 9eeaa50a..d16bde0c 100644 --- a/tests/PHPCensor/Plugin/Util/PhpUnitResultTest.php +++ b/tests/src/Plugin/Util/PhpUnitResultTest.php @@ -83,8 +83,8 @@ class PhpUnitResultTest extends \PHPUnit\Framework\TestCase public static function getTestData() { return [ - 'json' => [PhpUnitResultJson::class, 'tests/PHPCensor/Plugin/SampleFiles/phpunit_money.txt'], - 'junit' => [PhpUnitResultJunit::class, 'tests/PHPCensor/Plugin/SampleFiles/phpunit_money_junit.xml'], + 'json' => [PhpUnitResultJson::class, 'tests/data/Plugin/PhpUnit/phpunit_money.txt'], + 'junit' => [PhpUnitResultJunit::class, 'tests/data/Plugin/PhpUnit/phpunit_money_junit.xml'], ]; } } diff --git a/tests/PHPCensor/ProcessControl/PosixProcessControlTest.php b/tests/src/ProcessControl/PosixProcessControlTest.php similarity index 99% rename from tests/PHPCensor/ProcessControl/PosixProcessControlTest.php rename to tests/src/ProcessControl/PosixProcessControlTest.php index 2e46e356..4b46ead8 100644 --- a/tests/PHPCensor/ProcessControl/PosixProcessControlTest.php +++ b/tests/src/ProcessControl/PosixProcessControlTest.php @@ -1,4 +1,5 @@ render() == 'Hello'); } @@ -17,12 +17,12 @@ class ViewTest extends \PHPUnit\Framework\TestCase */ public function testInvalidView() { - new View('dogs', __DIR__ . '/data/view/'); + new View('dogs', ROOT_DIR . 'tests/data/View/'); } public function testViewVars() { - $view = new View('vars', __DIR__ . '/data/view/'); + $view = new View('vars', ROOT_DIR . 'tests/data/View/'); $view->who = 'World'; self::assertTrue(isset($view->who));