help->title)) + if (!empty(Core::getConfig()->help->title)) { $registerNavItem( - getConfig()->help->title, + Core::getConfig()->help->title, \Chibi\Router::linkTo(['StaticPagesController', 'helpView']), $activeController == 'static-pages' and $activeAction == 'help'); } diff --git a/src/Views/user-list.phtml b/src/Views/user-list.phtml index 13899dfd..6961c683 100644 --- a/src/Views/user-list.phtml +++ b/src/Views/user-list.phtml @@ -14,7 +14,7 @@ Assets::addStylesheet('user-list.css'); 'order:date,desc' => 'Sort new→old', ]; - if (getConfig()->registration->staffActivation) + if (Core::getConfig()->registration->staffActivation) $filters['pending'] = 'Pending staff review'; ?> diff --git a/src/Views/user-view.phtml b/src/Views/user-view.phtml index 158f6f22..a5d2b6e5 100644 --- a/src/Views/user-view.phtml +++ b/src/Views/user-view.phtml @@ -104,7 +104,7 @@ Assets::addStylesheet('user-view.css'); if (Access::check(new Privilege(Privilege::AcceptUserRegistration)) and !$this->context->transport->user->isStaffConfirmed() - and getConfig()->registration->staffActivation) + and Core::getConfig()->registration->staffActivation) { $options []= [ diff --git a/src/core.php b/src/core.php index 8caed07a..85be5039 100644 --- a/src/core.php +++ b/src/core.php @@ -37,7 +37,6 @@ final class Core static function prepareConfig($testEnvironment) { //load config manually - global $config; global $rootDir; $configPaths = []; @@ -178,16 +177,5 @@ final class Core } } -//legacy -function getConfig() -{ - return Core::getConfig(); -} - -function getContext() -{ - return Core::getContext(); -} - Core::prepareConfig(false); Core::prepareEnvironment(false); diff --git a/tests/Support/TestSupport.php b/tests/Support/TestSupport.php index 271d8e99..0063f4c5 100644 --- a/tests/Support/TestSupport.php +++ b/tests/Support/TestSupport.php @@ -10,7 +10,7 @@ class TestSupport public function getPath($assetName) { - return TextHelper::absolutePath(getConfig()->rootDir . DS . 'tests' . DS . 'Files' . DS . $assetName); + return TextHelper::absolutePath(Core::getConfig()->rootDir . DS . 'tests' . DS . 'Files' . DS . $assetName); } public function assertTagNames($post, $tags) diff --git a/tests/Tests/AbstractFullApiTest.php b/tests/Tests/AbstractFullApiTest.php index cefb6aa2..a3389dd9 100644 --- a/tests/Tests/AbstractFullApiTest.php +++ b/tests/Tests/AbstractFullApiTest.php @@ -19,7 +19,7 @@ abstract class AbstractFullApiTest extends AbstractTest protected function getAllJobs() { - $pathToJobs = getConfig()->rootDir . DS . 'src' . DS . 'Api' . DS . 'Jobs'; + $pathToJobs = Core::getConfig()->rootDir . DS . 'src' . DS . 'Api' . DS . 'Jobs'; $directory = new RecursiveDirectoryIterator($pathToJobs); $iterator = new RecursiveIteratorIterator($directory); $regex = new RegexIterator($iterator, '/^.+Job\.php$/i'); diff --git a/tests/Tests/AbstractTest.php b/tests/Tests/AbstractTest.php index 8249d3f4..e2e65dbd 100644 --- a/tests/Tests/AbstractTest.php +++ b/tests/Tests/AbstractTest.php @@ -33,13 +33,13 @@ class AbstractTest protected function grantAccess($privilege) { - getConfig()->privileges->$privilege = 'anonymous'; + Core::getConfig()->privileges->$privilege = 'anonymous'; Access::init(); } protected function revokeAccess($privilege) { - getConfig()->privileges->$privilege = 'nobody'; + Core::getConfig()->privileges->$privilege = 'nobody'; Access::init(); } } diff --git a/tests/Tests/ApiTests/ApiAuthTest.php b/tests/Tests/ApiTests/ApiAuthTest.php index ee6f958f..fa1fe2c6 100644 --- a/tests/Tests/ApiTests/ApiAuthTest.php +++ b/tests/Tests/ApiTests/ApiAuthTest.php @@ -60,7 +60,7 @@ class ApiAuthTest extends AbstractFullApiTest public function testAuthEnforcing() { - getConfig()->registration->needEmailForCommenting = false; + Core::getConfig()->registration->needEmailForCommenting = false; $this->grantAccess('addComment'); $comment = $this->commentMocker->mockSingle(); diff --git a/tests/Tests/ApiTests/ApiEmailRequirementsTest.php b/tests/Tests/ApiTests/ApiEmailRequirementsTest.php index 8aceb739..ab9b8e32 100644 --- a/tests/Tests/ApiTests/ApiEmailRequirementsTest.php +++ b/tests/Tests/ApiTests/ApiEmailRequirementsTest.php @@ -3,8 +3,8 @@ class ApiEmailRequirementsTest extends AbstractFullApiTest { public function testRegularEmailRequirements() { - getConfig()->registration->needEmailForCommenting = true; - getConfig()->registration->needEmailForUploading = true; + Core::getConfig()->registration->needEmailForCommenting = true; + Core::getConfig()->registration->needEmailForUploading = true; $this->testRegularEmailRequirement(new AcceptUserRegistrationJob()); $this->testRegularEmailRequirement(new ActivateUserEmailJob()); @@ -68,10 +68,10 @@ class ApiEmailRequirementsTest extends AbstractFullApiTest { $this->testedJobs []= $job; - getConfig()->registration->needEmailForCommenting = false; + Core::getConfig()->registration->needEmailForCommenting = false; $this->assert->areEqual(false, $job->isConfirmedEmailRequired()); - getConfig()->registration->needEmailForCommenting = true; + Core::getConfig()->registration->needEmailForCommenting = true; $this->assert->areEqual(true, $job->isConfirmedEmailRequired()); } @@ -81,10 +81,10 @@ class ApiEmailRequirementsTest extends AbstractFullApiTest $this->testedJobs []= $job; - getConfig()->registration->needEmailForUploading = false; + Core::getConfig()->registration->needEmailForUploading = false; $this->assert->areEqual(false, $job->isConfirmedEmailRequired()); - getConfig()->registration->needEmailForUploading = true; + Core::getConfig()->registration->needEmailForUploading = true; $this->assert->areEqual(true, $job->isConfirmedEmailRequired()); } @@ -92,7 +92,7 @@ class ApiEmailRequirementsTest extends AbstractFullApiTest { $this->grantAccess('addComment'); $this->login($this->userMocker->mockSingle()); - getConfig()->registration->needEmailForCommenting = true; + Core::getConfig()->registration->needEmailForCommenting = true; $this->assert->throws(function() { $post = $this->postMocker->mockSingle(); diff --git a/tests/Tests/ApiTests/ApiPrivilegeTest.php b/tests/Tests/ApiTests/ApiPrivilegeTest.php index acbd8258..a286ccb5 100644 --- a/tests/Tests/ApiTests/ApiPrivilegeTest.php +++ b/tests/Tests/ApiTests/ApiPrivilegeTest.php @@ -195,7 +195,7 @@ class ApiPrivilegeTest extends AbstractFullApiTest $this->assert->throws(function() { $post = $this->postMocker->mockSingle(); - getConfig()->registration->needEmailForCommenting = false; + Core::getConfig()->registration->needEmailForCommenting = false; return Api::run( new AddCommentJob(), [ diff --git a/tests/Tests/JobTests/ActivateUserEmailJobTest.php b/tests/Tests/JobTests/ActivateUserEmailJobTest.php index ed5cbf49..2a44b6db 100644 --- a/tests/Tests/JobTests/ActivateUserEmailJobTest.php +++ b/tests/Tests/JobTests/ActivateUserEmailJobTest.php @@ -3,7 +3,7 @@ class ActivateUserEmailJobTest extends AbstractTest { public function testSending() { - getConfig()->registration->needEmailForRegistering = true; + Core::getConfig()->registration->needEmailForRegistering = true; Mailer::mockSending(); $user = $this->userMocker->mockSingle(); @@ -35,7 +35,7 @@ class ActivateUserEmailJobTest extends AbstractTest public function testConfirming() { - getConfig()->registration->needEmailForRegistering = true; + Core::getConfig()->registration->needEmailForRegistering = true; Mailer::mockSending(); $user = $this->userMocker->mockSingle(); @@ -74,7 +74,7 @@ class ActivateUserEmailJobTest extends AbstractTest public function testUsingTokenTwice() { - getConfig()->registration->needEmailForRegistering = true; + Core::getConfig()->registration->needEmailForRegistering = true; Mailer::mockSending(); $user = $this->userMocker->mockSingle(); diff --git a/tests/Tests/JobTests/AddCommentJobTest.php b/tests/Tests/JobTests/AddCommentJobTest.php index d1f54aea..57de2799 100644 --- a/tests/Tests/JobTests/AddCommentJobTest.php +++ b/tests/Tests/JobTests/AddCommentJobTest.php @@ -31,7 +31,7 @@ class AddCommentJobTest extends AbstractTest $this->prepare(); $this->assert->doesNotThrow(function() { - $this->runApi(str_repeat('b', getConfig()->comments->minLength)); + $this->runApi(str_repeat('b', Core::getConfig()->comments->minLength)); }); } @@ -40,7 +40,7 @@ class AddCommentJobTest extends AbstractTest $this->prepare(); $this->assert->doesNotThrow(function() { - $this->runApi(str_repeat('b', getConfig()->comments->maxLength)); + $this->runApi(str_repeat('b', Core::getConfig()->comments->maxLength)); }); } @@ -49,7 +49,7 @@ class AddCommentJobTest extends AbstractTest $this->prepare(); $this->assert->throws(function() { - $this->runApi(str_repeat('b', getConfig()->comments->minLength - 1)); + $this->runApi(str_repeat('b', Core::getConfig()->comments->minLength - 1)); }, 'Comment must have at least'); } @@ -58,7 +58,7 @@ class AddCommentJobTest extends AbstractTest $this->prepare(); $this->assert->throws(function() { - $this->runApi(str_repeat('b', getConfig()->comments->maxLength + 1)); + $this->runApi(str_repeat('b', Core::getConfig()->comments->maxLength + 1)); }, 'Comment must have at most'); } @@ -109,7 +109,7 @@ class AddCommentJobTest extends AbstractTest protected function prepare() { - getConfig()->registration->needEmailForCommenting = false; + Core::getConfig()->registration->needEmailForCommenting = false; $this->grantAccess('addComment'); $this->login($this->userMocker->mockSingle()); } diff --git a/tests/Tests/JobTests/AddPostJobTest.php b/tests/Tests/JobTests/AddPostJobTest.php index 5029111a..53745252 100644 --- a/tests/Tests/JobTests/AddPostJobTest.php +++ b/tests/Tests/JobTests/AddPostJobTest.php @@ -154,6 +154,6 @@ class AddPostJobTest extends AbstractTest protected function prepare() { - getConfig()->registration->needEmailForUploading = false; + Core::getConfig()->registration->needEmailForUploading = false; } } diff --git a/tests/Tests/JobTests/AddUserJobTest.php b/tests/Tests/JobTests/AddUserJobTest.php index 2ef0e7bc..e747f9f2 100644 --- a/tests/Tests/JobTests/AddUserJobTest.php +++ b/tests/Tests/JobTests/AddUserJobTest.php @@ -45,14 +45,14 @@ class AddUserJobTest extends AbstractTest new AddUserJob(), [ JobArgs::ARG_NEW_USER_NAME => 'dummy', - JobArgs::ARG_NEW_PASSWORD => str_repeat('s', getConfig()->registration->passMinLength - 1), + JobArgs::ARG_NEW_PASSWORD => str_repeat('s', Core::getConfig()->registration->passMinLength - 1), ]); }, 'Password must have at least'); } public function testSkippingMailingUponFailing() //yo dog { - getConfig()->registration->needEmailForRegistering = true; + Core::getConfig()->registration->needEmailForRegistering = true; Mailer::mockSending(); $this->assert->areEqual(0, Mailer::getMailCounter()); @@ -64,7 +64,7 @@ class AddUserJobTest extends AbstractTest new AddUserJob(), [ JobArgs::ARG_NEW_USER_NAME => 'dummy', - JobArgs::ARG_NEW_PASSWORD => str_repeat('s', getConfig()->registration->passMinLength - 1), + JobArgs::ARG_NEW_PASSWORD => str_repeat('s', Core::getConfig()->registration->passMinLength - 1), JobArgs::ARG_NEW_EMAIL => 'godzilla@whitestar.gov', ]); }, 'Password must have at least'); @@ -89,7 +89,7 @@ class AddUserJobTest extends AbstractTest $this->assert->isTrue(strlen($user->getPasswordHash()) < 100); - getConfig()->registration->needEmailForRegistering = false; + Core::getConfig()->registration->needEmailForRegistering = false; $this->assert->doesNotThrow(function() use ($pass) { Auth::login('dummy', $pass, false); @@ -143,11 +143,11 @@ class AddUserJobTest extends AbstractTest public function testEmailsMixedConfirmation() { - getConfig()->registration->needEmailForRegistering = true; + Core::getConfig()->registration->needEmailForRegistering = true; Mailer::mockSending(); $this->assert->areEqual(0, Mailer::getMailCounter()); - getConfig()->privileges->changeUserEmailNoConfirm = 'admin'; + Core::getConfig()->privileges->changeUserEmailNoConfirm = 'admin'; $this->grantAccess('registerAccount'); $user1 = $this->assert->doesNotThrow(function() @@ -185,11 +185,11 @@ class AddUserJobTest extends AbstractTest public function testEmailsEveryoneMustConfirm() { - getConfig()->registration->needEmailForRegistering = true; + Core::getConfig()->registration->needEmailForRegistering = true; Mailer::mockSending(); $this->assert->areEqual(0, Mailer::getMailCounter()); - getConfig()->privileges->changeUserEmailNoConfirm = 'nobody'; + Core::getConfig()->privileges->changeUserEmailNoConfirm = 'nobody'; $this->grantAccess('registerAccount'); $user1 = $this->assert->doesNotThrow(function() @@ -225,11 +225,11 @@ class AddUserJobTest extends AbstractTest public function testEmailsEveryoneSkipConfirm() { - getConfig()->registration->needEmailForRegistering = true; + Core::getConfig()->registration->needEmailForRegistering = true; Mailer::mockSending(); $this->assert->areEqual(0, Mailer::getMailCounter()); - getConfig()->privileges->changeUserEmailNoConfirm = 'anonymous'; + Core::getConfig()->privileges->changeUserEmailNoConfirm = 'anonymous'; $this->grantAccess('registerAccount'); $user1 = $this->assert->doesNotThrow(function() @@ -265,7 +265,7 @@ class AddUserJobTest extends AbstractTest public function testEmailsTwoUsersSameMail() { - getConfig()->registration->needEmailForRegistering = true; + Core::getConfig()->registration->needEmailForRegistering = true; Mailer::mockSending(); $this->assert->areEqual(0, Mailer::getMailCounter()); diff --git a/tests/Tests/JobTests/EditCommentJobTest.php b/tests/Tests/JobTests/EditCommentJobTest.php index cf0b6286..897621a4 100644 --- a/tests/Tests/JobTests/EditCommentJobTest.php +++ b/tests/Tests/JobTests/EditCommentJobTest.php @@ -28,7 +28,7 @@ class EditCommentJobTest extends AbstractTest $this->grantAccess('editComment.own'); $this->assert->doesNotThrow(function() { - $this->runApi(str_repeat('b', getConfig()->comments->minLength)); + $this->runApi(str_repeat('b', Core::getConfig()->comments->minLength)); }); } @@ -38,7 +38,7 @@ class EditCommentJobTest extends AbstractTest $this->grantAccess('editComment.own'); $this->assert->doesNotThrow(function() { - $this->runApi(str_repeat('b', getConfig()->comments->maxLength)); + $this->runApi(str_repeat('b', Core::getConfig()->comments->maxLength)); }); } @@ -48,7 +48,7 @@ class EditCommentJobTest extends AbstractTest $this->grantAccess('editComment.own'); $this->assert->throws(function() { - $this->runApi(str_repeat('b', getConfig()->comments->minLength - 1)); + $this->runApi(str_repeat('b', Core::getConfig()->comments->minLength - 1)); }, 'Comment must have at least'); } @@ -58,7 +58,7 @@ class EditCommentJobTest extends AbstractTest $this->grantAccess('editComment.own'); $this->assert->throws(function() { - $this->runApi(str_repeat('b', getConfig()->comments->maxLength + 1)); + $this->runApi(str_repeat('b', Core::getConfig()->comments->maxLength + 1)); }, 'Comment must have at most'); } diff --git a/tests/Tests/JobTests/EditPostSourceJobTest.php b/tests/Tests/JobTests/EditPostSourceJobTest.php index 7fd67112..2ecd270b 100644 --- a/tests/Tests/JobTests/EditPostSourceJobTest.php +++ b/tests/Tests/JobTests/EditPostSourceJobTest.php @@ -23,7 +23,7 @@ class EditPostSourceJobTest extends AbstractTest $this->grantAccess('editPostSource.own'); $this->assert->doesNotThrow(function() { - $this->runApi(str_repeat('a', getConfig()->posts->maxSourceLength)); + $this->runApi(str_repeat('a', Core::getConfig()->posts->maxSourceLength)); }); } @@ -33,7 +33,7 @@ class EditPostSourceJobTest extends AbstractTest $this->grantAccess('editPostSource.own'); $this->assert->throws(function() { - $this->runApi(str_repeat('a', getConfig()->posts->maxSourceLength + 1)); + $this->runApi(str_repeat('a', Core::getConfig()->posts->maxSourceLength + 1)); }, 'Source must have at most'); } diff --git a/tests/Tests/JobTests/EditPostTagsJobTest.php b/tests/Tests/JobTests/EditPostTagsJobTest.php index 3c5a761f..f67745f1 100644 --- a/tests/Tests/JobTests/EditPostTagsJobTest.php +++ b/tests/Tests/JobTests/EditPostTagsJobTest.php @@ -49,7 +49,7 @@ class EditPostTagsJobTest extends AbstractTest $post = $this->postMocker->mockSingle(); $this->grantAccess('editPostTags'); - $newTagNames = [str_repeat('u', getConfig()->tags->minLength - 1)]; + $newTagNames = [str_repeat('u', Core::getConfig()->tags->minLength - 1)]; $this->assert->throws(function() use ($post, $newTagNames) { Api::run( @@ -66,7 +66,7 @@ class EditPostTagsJobTest extends AbstractTest $post = $this->postMocker->mockSingle(); $this->grantAccess('editPostTags'); - $newTagNames = [str_repeat('u', getConfig()->tags->maxLength + 1)]; + $newTagNames = [str_repeat('u', Core::getConfig()->tags->maxLength + 1)]; $this->assert->throws(function() use ($post, $newTagNames) { Api::run( diff --git a/tests/Tests/JobTests/EditUserAccessRankJobTest.php b/tests/Tests/JobTests/EditUserAccessRankJobTest.php index 63cc0bcb..dc640789 100644 --- a/tests/Tests/JobTests/EditUserAccessRankJobTest.php +++ b/tests/Tests/JobTests/EditUserAccessRankJobTest.php @@ -41,7 +41,7 @@ class EditUserAccessRankJobTest extends AbstractTest public function testHigherThanMyselfDenial() { - getConfig()->privileges->changeUserAccessRank = 'power-user'; + Core::getConfig()->privileges->changeUserAccessRank = 'power-user'; Access::init(); $user = $this->userMocker->mockSingle(); diff --git a/tests/Tests/JobTests/EditUserEmailJobTest.php b/tests/Tests/JobTests/EditUserEmailJobTest.php index 41049dba..f5d1c1ba 100644 --- a/tests/Tests/JobTests/EditUserEmailJobTest.php +++ b/tests/Tests/JobTests/EditUserEmailJobTest.php @@ -3,11 +3,11 @@ class EditUserEmailJobTest extends AbstractTest { public function testNoConfirmation() { - getConfig()->registration->needEmailForRegistering = false; + Core::getConfig()->registration->needEmailForRegistering = false; Mailer::mockSending(); $this->assert->areEqual(0, Mailer::getMailCounter()); - getConfig()->privileges->changeUserEmailNoConfirm = 'anonymous'; + Core::getConfig()->privileges->changeUserEmailNoConfirm = 'anonymous'; $this->grantAccess('changeUserEmail'); $user = $this->userMocker->mockSingle(); @@ -30,11 +30,11 @@ class EditUserEmailJobTest extends AbstractTest public function testConfirmation() { - getConfig()->registration->needEmailForRegistering = false; + Core::getConfig()->registration->needEmailForRegistering = false; Mailer::mockSending(); $this->assert->areEqual(0, Mailer::getMailCounter()); - getConfig()->privileges->changeUserEmailNoConfirm = 'admin'; + Core::getConfig()->privileges->changeUserEmailNoConfirm = 'admin'; $this->grantAccess('changeUserEmail'); $user = $this->userMocker->mockSingle(); @@ -57,10 +57,10 @@ class EditUserEmailJobTest extends AbstractTest public function testInvalidEmail() { - getConfig()->registration->needEmailForRegistering = false; + Core::getConfig()->registration->needEmailForRegistering = false; Mailer::mockSending(); - getConfig()->privileges->changeUserEmailNoConfirm = 'nobody'; + Core::getConfig()->privileges->changeUserEmailNoConfirm = 'nobody'; $this->grantAccess('changeUserEmail'); $user = $this->userMocker->mockSingle(); @@ -78,11 +78,11 @@ class EditUserEmailJobTest extends AbstractTest public function testChangingToExistingDenial() { - getConfig()->registration->needEmailForRegistering = false; + Core::getConfig()->registration->needEmailForRegistering = false; Mailer::mockSending(); $this->assert->areEqual(0, Mailer::getMailCounter()); - getConfig()->privileges->changeUserEmailNoConfirm = 'anonymous'; + Core::getConfig()->privileges->changeUserEmailNoConfirm = 'anonymous'; $this->grantAccess('changeUserEmail'); list ($user, $otherUser) diff --git a/tests/Tests/JobTests/EditUserNameJobTest.php b/tests/Tests/JobTests/EditUserNameJobTest.php index ff646b62..5ed42250 100644 --- a/tests/Tests/JobTests/EditUserNameJobTest.php +++ b/tests/Tests/JobTests/EditUserNameJobTest.php @@ -28,7 +28,7 @@ class EditUserNameJobTest extends AbstractTest $this->grantAccess('changeUserName'); $user = $this->userMocker->mockSingle(); - $newName = str_repeat('a', getConfig()->registration->userNameMinLength - 1); + $newName = str_repeat('a', Core::getConfig()->registration->userNameMinLength - 1); $this->assert->throws(function() use ($user, $newName) { @@ -46,7 +46,7 @@ class EditUserNameJobTest extends AbstractTest $this->grantAccess('changeUserName'); $user = $this->userMocker->mockSingle(); - $newName = str_repeat('a', getConfig()->registration->userNameMaxLength + 1); + $newName = str_repeat('a', Core::getConfig()->registration->userNameMaxLength + 1); $this->assert->throws(function() use ($user, $newName) { diff --git a/tests/Tests/JobTests/EditUserPasswordJobTest.php b/tests/Tests/JobTests/EditUserPasswordJobTest.php index 9650b374..cc718de9 100644 --- a/tests/Tests/JobTests/EditUserPasswordJobTest.php +++ b/tests/Tests/JobTests/EditUserPasswordJobTest.php @@ -16,7 +16,7 @@ class EditUserPasswordJobTest extends AbstractTest $this->grantAccess('changeUserPassword'); $user = $this->userMocker->mockSingle(); - $newPassword = str_repeat('a', getConfig()->registration->passMinLength - 1); + $newPassword = str_repeat('a', Core::getConfig()->registration->passMinLength - 1); $oldPasswordHash = $user->getPasswordHash(); $this->assert->throws(function() use ($user, $newPassword) @@ -51,7 +51,7 @@ class EditUserPasswordJobTest extends AbstractTest $this->assert->areEqual($newPasswordHash, $user->getPasswordHash()); - getConfig()->registration->needEmailForRegistering = false; + Core::getConfig()->registration->needEmailForRegistering = false; $this->assert->doesNotThrow(function() use ($user, $newPassword) { Auth::login($user->getName(), $newPassword, false); diff --git a/tests/Tests/JobTests/GetLogJobTest.php b/tests/Tests/JobTests/GetLogJobTest.php index 0b2a9451..48d57af8 100644 --- a/tests/Tests/JobTests/GetLogJobTest.php +++ b/tests/Tests/JobTests/GetLogJobTest.php @@ -37,7 +37,7 @@ class GetLogJobTest extends AbstractTest private function run($args) { - getConfig()->browsing->logsPerPage = 2; + Core::getConfig()->browsing->logsPerPage = 2; $this->grantAccess('viewLog'); Logger::log('line1'); Logger::log('line2'); diff --git a/tests/Tests/JobTests/GetPostThumbJobTest.php b/tests/Tests/JobTests/GetPostThumbJobTest.php index f3c1f9a6..d78fe3b1 100644 --- a/tests/Tests/JobTests/GetPostThumbJobTest.php +++ b/tests/Tests/JobTests/GetPostThumbJobTest.php @@ -18,7 +18,7 @@ class GetPostThumbJobTest extends AbstractTest $this->assert->isNotNull($post->tryGetWorkingFullPath()); $this->assert->areEqual('image/jpeg', $output->mimeType); $this->assert->areNotEqual( - file_get_contents(getConfig()->main->mediaPath . DS . 'img' . DS . 'thumb.jpg'), + file_get_contents(Core::getConfig()->main->mediaPath . DS . 'img' . DS . 'thumb.jpg'), $output->fileContent); } diff --git a/tests/Tests/JobTests/ListCommentsJobTest.php b/tests/Tests/JobTests/ListCommentsJobTest.php index 477d0ca1..78bc2951 100644 --- a/tests/Tests/JobTests/ListCommentsJobTest.php +++ b/tests/Tests/JobTests/ListCommentsJobTest.php @@ -44,7 +44,7 @@ class ListCommentJobTest extends AbstractTest $this->grantAccess('listComments'); $this->grantAccess('listPosts'); - getConfig()->comments->commentsPerPage = 2; + Core::getConfig()->comments->commentsPerPage = 2; $this->assert->areEqual(0, CommentModel::getCount()); diff --git a/tests/Tests/JobTests/ListLogsJobTest.php b/tests/Tests/JobTests/ListLogsJobTest.php index 5c174eb3..842cda7c 100644 --- a/tests/Tests/JobTests/ListLogsJobTest.php +++ b/tests/Tests/JobTests/ListLogsJobTest.php @@ -5,12 +5,12 @@ class ListLogsJobTest extends AbstractTest { $this->grantAccess('listLogs'); - getConfig()->main->logsPath = TextHelper::absolutePath(getConfig()->rootDir . '/tests/logs/test1.log'); + Core::getConfig()->main->logsPath = TextHelper::absolutePath(Core::getConfig()->rootDir . '/tests/logs/test1.log'); Logger::init(); Logger::log('nonsense'); - getConfig()->main->logsPath = TextHelper::absolutePath(getConfig()->rootDir . '/tests/logs/test2.log'); + Core::getConfig()->main->logsPath = TextHelper::absolutePath(Core::getConfig()->rootDir . '/tests/logs/test2.log'); Logger::init(); Logger::log('nonsense'); diff --git a/tests/Tests/JobTests/ListPostsJobTest.php b/tests/Tests/JobTests/ListPostsJobTest.php index b4474142..6b47c043 100644 --- a/tests/Tests/JobTests/ListPostsJobTest.php +++ b/tests/Tests/JobTests/ListPostsJobTest.php @@ -5,7 +5,7 @@ class ListPostsJobTest extends AbstractTest { $this->grantAccess('listPosts'); $posts = $this->postMocker->mockMultiple(3); - getConfig()->browsing->postsPerPage = 2; + Core::getConfig()->browsing->postsPerPage = 2; $ret = $this->assert->doesNotThrow(function() { diff --git a/tests/Tests/JobTests/ListRelatedTagsJobTest.php b/tests/Tests/JobTests/ListRelatedTagsJobTest.php index c0bc6e72..f8654dcd 100644 --- a/tests/Tests/JobTests/ListRelatedTagsJobTest.php +++ b/tests/Tests/JobTests/ListRelatedTagsJobTest.php @@ -7,7 +7,7 @@ class ListRelatedTagsJobTest extends AbstractTest $this->grantAccess('listPosts'); $tags = $this->tagMocker->mockMultiple(3); - getConfig()->browsing->tagsRelated = 1; + Core::getConfig()->browsing->tagsRelated = 1; $post = $this->postMocker->mockSingle(); $post->setTags($tags); diff --git a/tests/Tests/JobTests/ListTagsJobTest.php b/tests/Tests/JobTests/ListTagsJobTest.php index 355db9d8..dddd7c05 100644 --- a/tests/Tests/JobTests/ListTagsJobTest.php +++ b/tests/Tests/JobTests/ListTagsJobTest.php @@ -7,7 +7,7 @@ class ListTagsJobTest extends AbstractTest $this->grantAccess('listPosts'); $tags = $this->tagMocker->mockMultiple(3); - getConfig()->browsing->tagsPerPage = 2; + Core::getConfig()->browsing->tagsPerPage = 2; $post = $this->postMocker->mockSingle(); $post->setTags($tags); diff --git a/tests/Tests/JobTests/ListUsersJobTest.php b/tests/Tests/JobTests/ListUsersJobTest.php index 9b5f0bbc..40c8cf9a 100644 --- a/tests/Tests/JobTests/ListUsersJobTest.php +++ b/tests/Tests/JobTests/ListUsersJobTest.php @@ -6,7 +6,7 @@ class ListUsersJobTest extends AbstractTest $this->grantAccess('listUsers'); $users = $this->userMocker->mockMultiple(3); - getConfig()->browsing->usersPerPage = 2; + Core::getConfig()->browsing->usersPerPage = 2; $ret = $this->assert->doesNotThrow(function() { diff --git a/tests/Tests/JobTests/PasswordResetJobTest.php b/tests/Tests/JobTests/PasswordResetJobTest.php index 20d01faf..ed6434dd 100644 --- a/tests/Tests/JobTests/PasswordResetJobTest.php +++ b/tests/Tests/JobTests/PasswordResetJobTest.php @@ -3,7 +3,7 @@ class PasswordResetJobTest extends AbstractTest { public function testDontSendIfUnconfirmedMail() { - getConfig()->registration->needEmailForRegistering = true; + Core::getConfig()->registration->needEmailForRegistering = true; Mailer::mockSending(); $user = $this->userMocker->mockSingle(); @@ -22,7 +22,7 @@ class PasswordResetJobTest extends AbstractTest public function testSending() { - getConfig()->registration->needEmailForRegistering = true; + Core::getConfig()->registration->needEmailForRegistering = true; Mailer::mockSending(); $user = $this->userMocker->mockSingle(); @@ -54,7 +54,7 @@ class PasswordResetJobTest extends AbstractTest public function testObtainingNewPassword() { - getConfig()->registration->needEmailForRegistering = true; + Core::getConfig()->registration->needEmailForRegistering = true; Mailer::mockSending(); $user = $this->userMocker->mockSingle(); @@ -94,7 +94,7 @@ class PasswordResetJobTest extends AbstractTest public function testUsingTokenTwice() { - getConfig()->registration->needEmailForRegistering = true; + Core::getConfig()->registration->needEmailForRegistering = true; Mailer::mockSending(); $user = $this->userMocker->mockSingle(); diff --git a/tests/Tests/JobTests/PreviewCommentJobTest.php b/tests/Tests/JobTests/PreviewCommentJobTest.php index 30d8e864..b38e600d 100644 --- a/tests/Tests/JobTests/PreviewCommentJobTest.php +++ b/tests/Tests/JobTests/PreviewCommentJobTest.php @@ -26,7 +26,7 @@ class PreviewCommentJobTest extends AbstractTest $this->prepare(); $this->assert->doesNotThrow(function() { - return $this->runApi(str_repeat('b', getConfig()->comments->minLength)); + return $this->runApi(str_repeat('b', Core::getConfig()->comments->minLength)); }); } @@ -35,7 +35,7 @@ class PreviewCommentJobTest extends AbstractTest $this->prepare(); $this->assert->doesNotThrow(function() { - return $this->runApi(str_repeat('b', getConfig()->comments->maxLength)); + return $this->runApi(str_repeat('b', Core::getConfig()->comments->maxLength)); }); } @@ -44,7 +44,7 @@ class PreviewCommentJobTest extends AbstractTest $this->prepare(); $this->assert->throws(function() { - return $this->runApi(str_repeat('b', getConfig()->comments->minLength - 1)); + return $this->runApi(str_repeat('b', Core::getConfig()->comments->minLength - 1)); }, 'Comment must have at least'); } @@ -53,7 +53,7 @@ class PreviewCommentJobTest extends AbstractTest $this->prepare(); $this->assert->throws(function() { - return $this->runApi(str_repeat('b', getConfig()->comments->maxLength + 1)); + return $this->runApi(str_repeat('b', Core::getConfig()->comments->maxLength + 1)); }, 'Comment must have at most'); } @@ -106,7 +106,7 @@ class PreviewCommentJobTest extends AbstractTest protected function prepare() { - getConfig()->registration->needEmailForCommenting = false; + Core::getConfig()->registration->needEmailForCommenting = false; $this->grantAccess('addComment'); $this->login($this->userMocker->mockSingle()); } diff --git a/tests/Tests/MiscTests/AccessTest.php b/tests/Tests/MiscTests/AccessTest.php index 379317f1..e708353e 100644 --- a/tests/Tests/MiscTests/AccessTest.php +++ b/tests/Tests/MiscTests/AccessTest.php @@ -28,7 +28,7 @@ class AccessTest extends AbstractTest public function testAccessRanks2() { - getConfig()->privileges->listPosts = 'power-user'; + Core::getConfig()->privileges->listPosts = 'power-user'; Access::init(); $user = $this->userMocker->mockSingle(); @@ -50,7 +50,7 @@ class AccessTest extends AbstractTest public function testSubPrivilegesOnlySub() { - getConfig()->privileges->{'listPosts.own'} = 'power-user'; + Core::getConfig()->privileges->{'listPosts.own'} = 'power-user'; Access::init(); $user = $this->userMocker->mockSingle(); @@ -62,16 +62,16 @@ class AccessTest extends AbstractTest public function testSubPrivilegesSubAndGeneralNormalOrder() { - getConfig()->privileges->{'listPosts.own'} = 'power-user'; - getConfig()->privileges->{'listPosts'} = 'admin'; + Core::getConfig()->privileges->{'listPosts.own'} = 'power-user'; + Core::getConfig()->privileges->{'listPosts'} = 'admin'; Access::init(); $this->testSubPrivilegesSubAndGeneral(); } public function testSubPrivilegesSubAndGeneralReverseOrder() { - getConfig()->privileges->{'listPosts'} = 'admin'; - getConfig()->privileges->{'listPosts.own'} = 'power-user'; + Core::getConfig()->privileges->{'listPosts'} = 'admin'; + Core::getConfig()->privileges->{'listPosts.own'} = 'power-user'; Access::init(); $this->testSubPrivilegesSubAndGeneral(); } @@ -92,18 +92,18 @@ class AccessTest extends AbstractTest public function testSubPrivilegesMultipleSubAndGeneralNormalOrder() { - getConfig()->privileges->{'listPosts.own'} = 'power-user'; - getConfig()->privileges->{'listPosts.all'} = 'admin'; - getConfig()->privileges->{'listPosts'} = 'nobody'; + Core::getConfig()->privileges->{'listPosts.own'} = 'power-user'; + Core::getConfig()->privileges->{'listPosts.all'} = 'admin'; + Core::getConfig()->privileges->{'listPosts'} = 'nobody'; Access::init(); $this->testSubPrivilegesMultipleSubAndGeneral(); } public function testSubPrivilegesMultipleSubAndGeneralReverseOrder() { - getConfig()->privileges->{'listPosts'} = 'nobody'; - getConfig()->privileges->{'listPosts.own'} = 'power-user'; - getConfig()->privileges->{'listPosts.all'} = 'admin'; + Core::getConfig()->privileges->{'listPosts'} = 'nobody'; + Core::getConfig()->privileges->{'listPosts.own'} = 'power-user'; + Core::getConfig()->privileges->{'listPosts.all'} = 'admin'; Access::init(); $this->testSubPrivilegesMultipleSubAndGeneral(); } diff --git a/tests/Tests/MiscTests/AuthTest.php b/tests/Tests/MiscTests/AuthTest.php index a78da3b4..9af1c95f 100644 --- a/tests/Tests/MiscTests/AuthTest.php +++ b/tests/Tests/MiscTests/AuthTest.php @@ -3,8 +3,8 @@ class AuthTest extends AbstractTest { public function testValidPassword() { - getConfig()->registration->staffActivation = false; - getConfig()->registration->needEmailForRegistering = false; + Core::getConfig()->registration->staffActivation = false; + Core::getConfig()->registration->needEmailForRegistering = false; $user = $this->prepareValidUser(); UserModel::save($user); @@ -19,8 +19,8 @@ class AuthTest extends AbstractTest public function testLoginViaEmail() { - getConfig()->registration->staffActivation = false; - getConfig()->registration->needEmailForRegistering = false; + Core::getConfig()->registration->staffActivation = false; + Core::getConfig()->registration->needEmailForRegistering = false; $user = $this->prepareValidUser(); $user->setConfirmedEmail('godzilla@whitestar.gov'); @@ -65,8 +65,8 @@ class AuthTest extends AbstractTest public function testBanned() { - getConfig()->registration->staffActivation = false; - getConfig()->registration->needEmailForRegistering = false; + Core::getConfig()->registration->staffActivation = false; + Core::getConfig()->registration->needEmailForRegistering = false; $user = $this->prepareValidUser(); $user->ban(); @@ -80,8 +80,8 @@ class AuthTest extends AbstractTest public function testStaffConfirmationEnabledFail() { - getConfig()->registration->staffActivation = true; - getConfig()->registration->needEmailForRegistering = false; + Core::getConfig()->registration->staffActivation = true; + Core::getConfig()->registration->needEmailForRegistering = false; $user = $this->prepareValidUser(); $user->setStaffConfirmed(false); @@ -95,8 +95,8 @@ class AuthTest extends AbstractTest public function testStaffConfirmationEnabledPass() { - getConfig()->registration->staffActivation = true; - getConfig()->registration->needEmailForRegistering = false; + Core::getConfig()->registration->staffActivation = true; + Core::getConfig()->registration->needEmailForRegistering = false; $user = $this->prepareValidUser(); $user->setStaffConfirmed(true); @@ -112,8 +112,8 @@ class AuthTest extends AbstractTest public function testStaffConfirmationDisabledPass() { - getConfig()->registration->staffActivation = false; - getConfig()->registration->needEmailForRegistering = false; + Core::getConfig()->registration->staffActivation = false; + Core::getConfig()->registration->needEmailForRegistering = false; $user = $this->prepareValidUser(); $user->setStaffConfirmed(false); @@ -129,8 +129,8 @@ class AuthTest extends AbstractTest public function testMailConfirmationEnabledFail1() { - getConfig()->registration->staffActivation = false; - getConfig()->registration->needEmailForRegistering = true; + Core::getConfig()->registration->staffActivation = false; + Core::getConfig()->registration->needEmailForRegistering = true; $user = $this->prepareValidUser(); $user->setStaffConfirmed(false); @@ -144,8 +144,8 @@ class AuthTest extends AbstractTest public function testMailConfirmationEnabledFail2() { - getConfig()->registration->staffActivation = false; - getConfig()->registration->needEmailForRegistering = true; + Core::getConfig()->registration->staffActivation = false; + Core::getConfig()->registration->needEmailForRegistering = true; $user = $this->prepareValidUser(); $user->setStaffConfirmed(false); @@ -160,8 +160,8 @@ class AuthTest extends AbstractTest public function testMailConfirmationEnabledPass() { - getConfig()->registration->staffActivation = false; - getConfig()->registration->needEmailForRegistering = true; + Core::getConfig()->registration->staffActivation = false; + Core::getConfig()->registration->needEmailForRegistering = true; $user = $this->prepareValidUser(); $user->setStaffConfirmed(false); diff --git a/tests/Tests/MiscTests/LoggerTest.php b/tests/Tests/MiscTests/LoggerTest.php index d2a8f7c9..9b9e9be0 100644 --- a/tests/Tests/MiscTests/LoggerTest.php +++ b/tests/Tests/MiscTests/LoggerTest.php @@ -26,10 +26,10 @@ class LoggerTest extends AbstractTest public function testPathChanging() { - $logPath = TextHelper::absolutePath(getConfig()->rootDir . '/tests/logs/{yyyy}-{mm}-{dd}.log'); - $realLogPath = TextHelper::absolutePath(getConfig()->rootDir . '/tests/logs/' . date('Y-m-d') . '.log'); + $logPath = TextHelper::absolutePath(Core::getConfig()->rootDir . '/tests/logs/{yyyy}-{mm}-{dd}.log'); + $realLogPath = TextHelper::absolutePath(Core::getConfig()->rootDir . '/tests/logs/' . date('Y-m-d') . '.log'); - getConfig()->main->logsPath = $logPath; + Core::getConfig()->main->logsPath = $logPath; $this->assert->doesNotThrow(function() { Logger::init(); diff --git a/tests/Tests/ModelTests/PostModelTest.php b/tests/Tests/ModelTests/PostModelTest.php index 08cef62b..c34883f5 100644 --- a/tests/Tests/ModelTests/PostModelTest.php +++ b/tests/Tests/ModelTests/PostModelTest.php @@ -74,7 +74,7 @@ class PostModelTest extends AbstractTest public function testAutoFeaturingOutdated() { $post = $this->postMocker->mockSingle(); - $minTimestamp = getConfig()->misc->featuredPostMaxDays * 24 * 3600; + $minTimestamp = Core::getConfig()->misc->featuredPostMaxDays * 24 * 3600; $this->assert->isTrue(PostModel::featureRandomPostIfNecessary()); PropertyModel::set(PropertyModel::FeaturedPostUnixTime, time() - $minTimestamp - 1); diff --git a/tests/Tests/ModelTests/UserModelTest.php b/tests/Tests/ModelTests/UserModelTest.php index 4620cb4d..afde1119 100644 --- a/tests/Tests/ModelTests/UserModelTest.php +++ b/tests/Tests/ModelTests/UserModelTest.php @@ -3,7 +3,7 @@ class UserModelTest extends AbstractTest { public function testSavingTwoUsersSameNameNoActivation() { - getConfig()->registration->needEmailForRegistering = false; + Core::getConfig()->registration->needEmailForRegistering = false; list ($user1, $user2) = $this->prepareTwoUsersWithSameName(); $this->assert->throws(function() use ($user2) { @@ -13,7 +13,7 @@ class UserModelTest extends AbstractTest public function testSavingTwoUsersSameNameEmailActivation() { - getConfig()->registration->needEmailForRegistering = true; + Core::getConfig()->registration->needEmailForRegistering = true; list ($user1, $user2) = $this->prepareTwoUsersWithSameName(); $this->assert->throws(function() use ($user2) { @@ -23,7 +23,7 @@ class UserModelTest extends AbstractTest public function testSavingTwoUsersSameNameStaffActivation() { - getConfig()->registration->staffActivation = true; + Core::getConfig()->registration->staffActivation = true; list ($user1, $user2) = $this->prepareTwoUsersWithSameName(); $this->assert->throws(function() use ($user2) { @@ -33,7 +33,7 @@ class UserModelTest extends AbstractTest public function testSavingTwoUsersSameEmailNoActivation() { - getConfig()->registration->needEmailForRegistering = false; + Core::getConfig()->registration->needEmailForRegistering = false; list ($user1, $user2) = $this->prepareTwoUsersWithSameEmail(false, false); $this->assert->throws(function() use ($user2) { @@ -43,7 +43,7 @@ class UserModelTest extends AbstractTest public function testSavingTwoUsersSameEmailEmailActivation() { - getConfig()->registration->needEmailForRegistering = true; + Core::getConfig()->registration->needEmailForRegistering = true; list ($user1, $user2) = $this->prepareTwoUsersWithSameEmail(false, false); $this->assert->throws(function() use ($user2) { @@ -53,7 +53,7 @@ class UserModelTest extends AbstractTest public function testSavingTwoUsersSameEmailStaffActivation() { - getConfig()->registration->staffActivation = true; + Core::getConfig()->registration->staffActivation = true; list ($user1, $user2) = $this->prepareTwoUsersWithSameEmail(false, false); $this->assert->throws(function() use ($user2) {