From 94d5c3c9443aec1c44b7c0786f0b3a4d42f7aad2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rub=C3=A9n=20D?= Date: Sun, 17 Mar 2024 08:00:35 +0100 Subject: [PATCH] ci(tests): Fix tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Rubén D --- tests/SPT/Generators/AccountDataGenerator.php | 136 +++++++++--------- tests/SPT/Generators/ConfigDataGenerator.php | 4 +- .../Generators/CustomFieldDataGenerator.php | 4 +- tests/SPT/Generators/CustomFieldGenerator.php | 18 +-- tests/SPT/Generators/FileDataGenerator.php | 2 +- .../Generators/ItemPresetDataGenerator.php | 20 +-- .../Generators/ItemSearchDataGenerator.php | 2 +- .../Generators/PublicLinkDataGenerator.php | 22 +-- tests/SPT/Generators/UserDataGenerator.php | 56 ++++---- .../Generators/UserProfileDataGenerator.php | 62 ++++---- tests/SPT/Http/RequestTest.php | 45 +++--- 11 files changed, 188 insertions(+), 183 deletions(-) diff --git a/tests/SPT/Generators/AccountDataGenerator.php b/tests/SPT/Generators/AccountDataGenerator.php index e2103709..1e7febcd 100644 --- a/tests/SPT/Generators/AccountDataGenerator.php +++ b/tests/SPT/Generators/AccountDataGenerator.php @@ -60,36 +60,36 @@ final class AccountDataGenerator extends DataGenerator { return [ 'id' => $this->faker->randomNumber(3), - 'name' => $this->faker->name, + 'name' => $this->faker->name(), 'clientId' => $this->faker->randomNumber(3), - 'clientName' => $this->faker->name, + 'clientName' => $this->faker->name(), 'categoryId' => $this->faker->randomNumber(3), - 'categoryName' => $this->faker->name, + 'categoryName' => $this->faker->name(), 'userId' => $this->faker->randomNumber(3), - 'userName' => $this->faker->userName, - 'userLogin' => $this->faker->name, + 'userName' => $this->faker->userName(), + 'userLogin' => $this->faker->name(), 'userGroupId' => $this->faker->randomNumber(3), - 'userGroupName' => $this->faker->name, + 'userGroupName' => $this->faker->name(), 'userEditId' => $this->faker->randomNumber(3), - 'userEditName' => $this->faker->userName, - 'userEditLogin' => $this->faker->name, - 'login' => $this->faker->name, - 'url' => $this->faker->url, - 'notes' => $this->faker->text, - 'otherUserEdit' => $this->faker->boolean, - 'otherUserGroupEdit' => $this->faker->boolean, - 'dateAdd' => $this->faker->unixTime, - 'dateEdit' => $this->faker->unixTime, + 'userEditName' => $this->faker->userName(), + 'userEditLogin' => $this->faker->name(), + 'login' => $this->faker->name(), + 'url' => $this->faker->url(), + 'notes' => $this->faker->text(), + 'otherUserEdit' => $this->faker->boolean(), + 'otherUserGroupEdit' => $this->faker->boolean(), + 'dateAdd' => $this->faker->unixTime(), + 'dateEdit' => $this->faker->unixTime(), 'countView' => $this->faker->randomNumber(3), 'countDecrypt' => $this->faker->randomNumber(3), - 'isPrivate' => $this->faker->boolean, - 'isPrivateGroup' => $this->faker->boolean, - 'passDate' => $this->faker->unixTime, - 'passDateChange' => $this->faker->unixTime, + 'isPrivate' => $this->faker->boolean(), + 'isPrivateGroup' => $this->faker->boolean(), + 'passDate' => $this->faker->unixTime(), + 'passDateChange' => $this->faker->unixTime(), 'parentId' => $this->faker->randomNumber(3), - 'publicLinkHash' => $this->faker->sha1, - 'pass' => $this->faker->password, - 'key' => $this->faker->sha1, + 'publicLinkHash' => $this->faker->sha1(), + 'pass' => $this->faker->password(), + 'key' => $this->faker->sha1(), ]; } @@ -99,7 +99,7 @@ final class AccountDataGenerator extends DataGenerator public function buildItemData(): array { return array_map( - fn() => new Item(['id' => $this->faker->randomNumber(3), 'name' => $this->faker->name]), + fn() => new Item(['id' => $this->faker->randomNumber(3), 'name' => $this->faker->name()]), range(0, 9) ); } @@ -110,7 +110,7 @@ final class AccountDataGenerator extends DataGenerator array_merge( [ 'num_files' => $this->faker->randomNumber(3), - 'publicLinkDateExpire' => $this->faker->unixTime, + 'publicLinkDateExpire' => $this->faker->unixTime(), 'publicLinkTotalCountViews' => $this->faker->randomNumber(3), ], $this->getAccountProperties() @@ -128,12 +128,12 @@ final class AccountDataGenerator extends DataGenerator return new Simple([ 'id' => $this->faker->randomNumber(3), 'accountId' => $this->faker->randomNumber(3), - 'name' => $this->faker->name, - 'login' => $this->faker->userName, - 'url' => $this->faker->url, - 'notes' => $this->faker->text, + 'name' => $this->faker->name(), + 'login' => $this->faker->userName(), + 'url' => $this->faker->url(), + 'notes' => $this->faker->text(), 'userEditId' => $this->faker->randomNumber(3), - 'passDateChange' => $this->faker->unixTime, + 'passDateChange' => $this->faker->unixTime(), 'clientId' => $this->faker->randomNumber(3), 'categoryId' => $this->faker->randomNumber(3), 'isPrivate' => $this->faker->numberBetween(0, 1), @@ -141,31 +141,31 @@ final class AccountDataGenerator extends DataGenerator 'parentId' => $this->faker->randomNumber(3), 'userId' => $this->faker->randomNumber(3), 'userGroupId' => $this->faker->randomNumber(3), - 'key' => $this->faker->text, - 'pass' => $this->faker->text, + 'key' => $this->faker->text(), + 'pass' => $this->faker->text(), ]); } public function buildAccountUpdateDto(): AccountUpdateDto { return new AccountUpdateDto( - name: $this->faker->name, - login: $this->faker->userName, + name: $this->faker->name(), + login: $this->faker->userName(), clientId: $this->faker->randomNumber(3), categoryId: $this->faker->randomNumber(3), - pass: $this->faker->password, + pass: $this->faker->password(), userId: $this->faker->randomNumber(3), - key: $this->faker->password, - url: $this->faker->url, - notes: $this->faker->text, + key: $this->faker->password(), + url: $this->faker->url(), + notes: $this->faker->text(), userEditId: $this->faker->randomNumber(3), - isPrivate: $this->faker->boolean, - isPrivateGroup: $this->faker->boolean, - passDateChange: $this->faker->unixTime, + isPrivate: $this->faker->boolean(), + isPrivateGroup: $this->faker->boolean(), + passDateChange: $this->faker->unixTime(), parentId: $this->faker->randomNumber(3), userGroupId: $this->faker->randomNumber(3), - otherUserEdit: $this->faker->boolean, - otherUserGroupEdit: $this->faker->boolean, + otherUserEdit: $this->faker->boolean(), + otherUserGroupEdit: $this->faker->boolean(), usersView: array_map(fn() => $this->faker->randomNumber(3), range(0, 4)), usersEdit: array_map(fn() => $this->faker->randomNumber(3), range(0, 4)), userGroupsView: array_map(fn() => $this->faker->randomNumber(3), range(0, 4)), @@ -177,22 +177,22 @@ final class AccountDataGenerator extends DataGenerator public function buildAccountCreateDto(): AccountCreateDto { return new AccountCreateDto( - name: $this->faker->name, - login: $this->faker->userName, + name: $this->faker->name(), + login: $this->faker->userName(), clientId: $this->faker->randomNumber(3), categoryId: $this->faker->randomNumber(3), - pass: $this->faker->password, + pass: $this->faker->password(), userId: $this->faker->randomNumber(3), - url: $this->faker->url, - notes: $this->faker->text, + url: $this->faker->url(), + notes: $this->faker->text(), userEditId: $this->faker->randomNumber(3), - isPrivate: $this->faker->boolean, - isPrivateGroup: $this->faker->boolean, - passDateChange: $this->faker->unixTime, + isPrivate: $this->faker->boolean(), + isPrivateGroup: $this->faker->boolean(), + passDateChange: $this->faker->unixTime(), parentId: $this->faker->randomNumber(3), userGroupId: $this->faker->randomNumber(3), - otherUserEdit: $this->faker->boolean, - otherUserGroupEdit: $this->faker->boolean, + otherUserEdit: $this->faker->boolean(), + otherUserGroupEdit: $this->faker->boolean(), usersView: array_map(fn() => $this->faker->randomNumber(3), range(0, 4)), usersEdit: array_map(fn() => $this->faker->randomNumber(3), range(0, 4)), userGroupsView: array_map(fn() => $this->faker->randomNumber(3), range(0, 4)), @@ -205,30 +205,30 @@ final class AccountDataGenerator extends DataGenerator { return new AccountHistoryDto( accountId: $this->faker->randomNumber(3), - isDelete: $this->faker->boolean, - isModify: $this->faker->boolean, - dateAdd: $this->faker->unixTime, - dateEdit: $this->faker->unixTime, - passDate: $this->faker->unixTime, + isDelete: $this->faker->boolean(), + isModify: $this->faker->boolean(), + dateAdd: $this->faker->unixTime(), + dateEdit: $this->faker->unixTime(), + passDate: $this->faker->unixTime(), countView: $this->faker->randomNumber(3), countDecrypt: $this->faker->randomNumber(3), - name: $this->faker->name, - login: $this->faker->userName, + name: $this->faker->name(), + login: $this->faker->userName(), clientId: $this->faker->randomNumber(3), categoryId: $this->faker->randomNumber(3), - pass: $this->faker->password, + pass: $this->faker->password(), userId: $this->faker->randomNumber(3), - key: $this->faker->password, - url: $this->faker->url, - notes: $this->faker->text, + key: $this->faker->password(), + url: $this->faker->url(), + notes: $this->faker->text(), userEditId: $this->faker->randomNumber(3), - isPrivate: $this->faker->boolean, - isPrivateGroup: $this->faker->boolean, - passDateChange: $this->faker->unixTime, + isPrivate: $this->faker->boolean(), + isPrivateGroup: $this->faker->boolean(), + passDateChange: $this->faker->unixTime(), parentId: $this->faker->randomNumber(3), userGroupId: $this->faker->randomNumber(3), - otherUserEdit: $this->faker->boolean, - otherUserGroupEdit: $this->faker->boolean, + otherUserEdit: $this->faker->boolean(), + otherUserGroupEdit: $this->faker->boolean(), ); } } diff --git a/tests/SPT/Generators/ConfigDataGenerator.php b/tests/SPT/Generators/ConfigDataGenerator.php index 1f8025ed..4de59bd5 100644 --- a/tests/SPT/Generators/ConfigDataGenerator.php +++ b/tests/SPT/Generators/ConfigDataGenerator.php @@ -4,7 +4,7 @@ * * @author nuxsmin * @link https://syspass.org - * @copyright 2012-2023, Rubén Domínguez nuxsmin@$syspass.org + * @copyright 2012-2024, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * @@ -36,7 +36,7 @@ final class ConfigDataGenerator extends DataGenerator public function buildConfigData(): ConfigData { return new ConfigData([ - ConfigDataInterface::PASSWORD_SALT => $this->faker->sha1, + ConfigDataInterface::PASSWORD_SALT => $this->faker->sha1(), ]); } } diff --git a/tests/SPT/Generators/CustomFieldDataGenerator.php b/tests/SPT/Generators/CustomFieldDataGenerator.php index 1159d87d..9ed77d27 100644 --- a/tests/SPT/Generators/CustomFieldDataGenerator.php +++ b/tests/SPT/Generators/CustomFieldDataGenerator.php @@ -41,14 +41,14 @@ final class CustomFieldDataGenerator extends DataGenerator $key = null; if ($useEncryption) { - $key = $this->faker->sha1; + $key = $this->faker->sha1(); } return [ 'moduleId' => $this->faker->randomNumber(3), 'itemId' => $this->faker->randomNumber(3), 'definitionId' => $this->faker->randomNumber(3), - 'data' => $this->faker->text, + 'data' => $this->faker->text(), 'key' => $key, ]; } diff --git a/tests/SPT/Generators/CustomFieldGenerator.php b/tests/SPT/Generators/CustomFieldGenerator.php index 9ae956f2..350ec755 100644 --- a/tests/SPT/Generators/CustomFieldGenerator.php +++ b/tests/SPT/Generators/CustomFieldGenerator.php @@ -37,22 +37,22 @@ final class CustomFieldGenerator extends DataGenerator $key = null; if ($useEncryption) { - $data = $this->faker->text; - $key = $this->faker->sha1; + $data = $this->faker->text(); + $key = $this->faker->sha1(); } return new Simple([ - 'required' => $this->faker->boolean, - 'showInList' => $this->faker->boolean, - 'help' => $this->faker->text, + 'required' => $this->faker->boolean(), + 'showInList' => $this->faker->boolean(), + 'help' => $this->faker->text(), 'definitionId' => $this->faker->randomNumber(3), - 'definitionName' => $this->faker->name, + 'definitionName' => $this->faker->name(), 'typeId' => $this->faker->randomNumber(3), - 'typeName' => $this->faker->name, - 'typeText' => $this->faker->text, + 'typeName' => $this->faker->name(), + 'typeText' => $this->faker->text(), 'moduleId' => $this->faker->randomNumber(3), 'formId' => $this->faker->randomNumber(3), - 'isEncrypted' => $this->faker->boolean, + 'isEncrypted' => $this->faker->boolean(), 'data' => $data, 'key' => $key, ]); diff --git a/tests/SPT/Generators/FileDataGenerator.php b/tests/SPT/Generators/FileDataGenerator.php index f4841786..986bd3c0 100644 --- a/tests/SPT/Generators/FileDataGenerator.php +++ b/tests/SPT/Generators/FileDataGenerator.php @@ -36,7 +36,7 @@ final class FileDataGenerator extends DataGenerator return new Simple( array_merge( $this->buildFileData()->toArray(null, null, true), - ['clientName' => $this->faker->name, 'accountName' => $this->faker->name] + ['clientName' => $this->faker->name(), 'accountName' => $this->faker->name()] ) ); } diff --git a/tests/SPT/Generators/ItemPresetDataGenerator.php b/tests/SPT/Generators/ItemPresetDataGenerator.php index 4ee445f2..ed410862 100644 --- a/tests/SPT/Generators/ItemPresetDataGenerator.php +++ b/tests/SPT/Generators/ItemPresetDataGenerator.php @@ -37,11 +37,11 @@ final class ItemPresetDataGenerator extends DataGenerator { return new ItemPreset([ 'id' => $this->faker->randomNumber(3), - 'type' => $this->faker->colorName, + 'type' => $this->faker->colorName(), 'userId' => $this->faker->randomNumber(3), 'userGroupId' => $this->faker->randomNumber(3), 'userProfileId' => $this->faker->randomNumber(3), - 'fixed' => (int)$this->faker->boolean, + 'fixed' => (int)$this->faker->boolean(), 'priority' => $this->faker->randomNumber(3), 'data' => serialize($data), ]); @@ -51,13 +51,13 @@ final class ItemPresetDataGenerator extends DataGenerator { return new Password( $this->faker->numberBetween(1, 12), - $this->faker->boolean, - $this->faker->boolean, - $this->faker->boolean, - $this->faker->boolean, - $this->faker->boolean, - $this->faker->boolean, - $this->faker->unixTime, + $this->faker->boolean(), + $this->faker->boolean(), + $this->faker->boolean(), + $this->faker->boolean(), + $this->faker->boolean(), + $this->faker->boolean(), + $this->faker->unixTime(), $this->faker->randomNumber(3), $this->faker->regexify('abc123') ); @@ -65,6 +65,6 @@ final class ItemPresetDataGenerator extends DataGenerator public function buildAccountPrivate(): AccountPrivate { - return new AccountPrivate($this->faker->boolean, $this->faker->boolean); + return new AccountPrivate($this->faker->boolean(), $this->faker->boolean()); } } diff --git a/tests/SPT/Generators/ItemSearchDataGenerator.php b/tests/SPT/Generators/ItemSearchDataGenerator.php index ccd590ea..09ae67b8 100644 --- a/tests/SPT/Generators/ItemSearchDataGenerator.php +++ b/tests/SPT/Generators/ItemSearchDataGenerator.php @@ -34,7 +34,7 @@ final class ItemSearchDataGenerator extends DataGenerator public function buildItemSearchData(): ItemSearchData { return new ItemSearchData( - $this->faker->name, + $this->faker->name(), $this->faker->randomNumber(3), $this->faker->randomNumber(3) ); diff --git a/tests/SPT/Generators/PublicLinkDataGenerator.php b/tests/SPT/Generators/PublicLinkDataGenerator.php index d2318fcb..a9c2dc16 100644 --- a/tests/SPT/Generators/PublicLinkDataGenerator.php +++ b/tests/SPT/Generators/PublicLinkDataGenerator.php @@ -45,7 +45,7 @@ final class PublicLinkDataGenerator extends DataGenerator 'hash' => $this->faker->randomNumber(3), 'userId' => $this->faker->randomNumber(3), 'typeId' => $this->faker->randomNumber(3), - 'notify' => $this->faker->boolean, + 'notify' => $this->faker->boolean(), 'dateAdd' => $this->faker->unixTime(), 'dateUpdate' => $this->faker->unixTime(), 'dateExpire' => $this->faker->unixTime(), @@ -53,7 +53,7 @@ final class PublicLinkDataGenerator extends DataGenerator 'totalCountViews' => $this->faker->randomNumber(3), 'maxCountViews' => $this->faker->randomNumber(3), 'useInfo' => serialize($this->getUseInfo()), - 'data' => $this->faker->text, + 'data' => $this->faker->text(), ]; } @@ -61,11 +61,11 @@ final class PublicLinkDataGenerator extends DataGenerator { return array_map( fn() => [ - 'who' => $this->faker->ipv4, - 'time' => $this->faker->unixTime, - 'hash' => $this->faker->sha1, - 'agent' => $this->faker->userAgent, - 'https' => $this->faker->boolean, + 'who' => $this->faker->ipv4(), + 'time' => $this->faker->unixTime(), + 'hash' => $this->faker->sha1(), + 'agent' => $this->faker->userAgent(), + 'https' => $this->faker->boolean(), ], range(0, 9) ); @@ -75,10 +75,10 @@ final class PublicLinkDataGenerator extends DataGenerator { return new PublicLinkList( array_merge($this->getPublicLinkProperties(), [ - 'userName' => $this->faker->name, - 'userLogin' => $this->faker->userName, - 'accountName' => $this->faker->colorName, - 'clientName' => $this->faker->company, + 'userName' => $this->faker->name(), + 'userLogin' => $this->faker->userName(), + 'accountName' => $this->faker->colorName(), + 'clientName' => $this->faker->company(), ]) ); } diff --git a/tests/SPT/Generators/UserDataGenerator.php b/tests/SPT/Generators/UserDataGenerator.php index 9d97426e..51b81233 100644 --- a/tests/SPT/Generators/UserDataGenerator.php +++ b/tests/SPT/Generators/UserDataGenerator.php @@ -45,24 +45,24 @@ final class UserDataGenerator extends DataGenerator { return [ 'id' => $this->faker->randomNumber(3), - 'name' => $this->faker->name, + 'name' => $this->faker->name(), 'email' => $this->faker->randomNumber(3), - 'login' => $this->faker->name, - 'ssoLogin' => $this->faker->userName, - 'notes' => $this->faker->text, + 'login' => $this->faker->name(), + 'ssoLogin' => $this->faker->userName(), + 'notes' => $this->faker->text(), 'userGroupId' => $this->faker->randomNumber(3), - 'userGroupName' => $this->faker->name, + 'userGroupName' => $this->faker->name(), 'userProfileId' => $this->faker->randomNumber(3), - 'isAdminApp' => $this->faker->boolean, - 'isAdminAcc' => $this->faker->boolean, - 'isDisabled' => $this->faker->boolean, - 'isChangePass' => $this->faker->boolean, - 'isChangedPass' => $this->faker->boolean, - 'isLdap' => $this->faker->boolean, - 'isMigrate' => $this->faker->boolean, + 'isAdminApp' => $this->faker->boolean(), + 'isAdminAcc' => $this->faker->boolean(), + 'isDisabled' => $this->faker->boolean(), + 'isChangePass' => $this->faker->boolean(), + 'isChangedPass' => $this->faker->boolean(), + 'isLdap' => $this->faker->boolean(), + 'isMigrate' => $this->faker->boolean(), 'loginCount' => $this->faker->randomNumber(3), - 'lastLogin' => $this->faker->unixTime, - 'lastUpdate' => $this->faker->unixTime, + 'lastLogin' => $this->faker->unixTime(), + 'lastUpdate' => $this->faker->unixTime(), 'preferences' => serialize($this->buildUserPreferencesData()), ]; } @@ -75,16 +75,16 @@ final class UserDataGenerator extends DataGenerator private function getUserPreferencesProperties(): array { return [ - 'lang' => $this->faker->languageCode, - 'theme' => $this->faker->colorName, + 'lang' => $this->faker->languageCode(), + 'theme' => $this->faker->colorName(), 'resultsPerPage' => $this->faker->randomNumber(3), - 'accountLink' => $this->faker->boolean, - 'sortViews' => $this->faker->boolean, - 'topNavbar' => $this->faker->boolean, - 'optionalActions' => $this->faker->boolean, - 'resultsAsCards' => $this->faker->boolean, - 'checkNotifications' => $this->faker->boolean, - 'showAccountSearchFilters' => $this->faker->boolean, + 'accountLink' => $this->faker->boolean(), + 'sortViews' => $this->faker->boolean(), + 'topNavbar' => $this->faker->boolean(), + 'optionalActions' => $this->faker->boolean(), + 'resultsAsCards' => $this->faker->boolean(), + 'checkNotifications' => $this->faker->boolean(), + 'showAccountSearchFilters' => $this->faker->boolean(), 'user_id' => $this->faker->randomNumber(3), ]; } @@ -96,11 +96,11 @@ final class UserDataGenerator extends DataGenerator { return [ 'id' => $this->faker->randomNumber(3), - 'pass' => $this->faker->password, - 'hashSalt' => $this->faker->sha1, - 'mPass' => $this->faker->sha1, - 'mKey' => $this->faker->sha1, - 'lastUpdateMPass' => $this->faker->dateTime->getTimestamp(), + 'pass' => $this->faker->password(), + 'hashSalt' => $this->faker->sha1(), + 'mPass' => $this->faker->sha1(), + 'mKey' => $this->faker->sha1(), + 'lastUpdateMPass' => $this->faker->dateTime()->getTimestamp(), ]; } diff --git a/tests/SPT/Generators/UserProfileDataGenerator.php b/tests/SPT/Generators/UserProfileDataGenerator.php index 88f62fae..872ffbfd 100644 --- a/tests/SPT/Generators/UserProfileDataGenerator.php +++ b/tests/SPT/Generators/UserProfileDataGenerator.php @@ -41,7 +41,7 @@ final class UserProfileDataGenerator extends DataGenerator { return [ 'id' => $this->faker->randomNumber(3), - 'name' => $this->faker->name, + 'name' => $this->faker->name(), 'profile' => $this->buildProfileData(), ]; } @@ -54,36 +54,36 @@ final class UserProfileDataGenerator extends DataGenerator private function getProfileProperties(): array { return [ - 'accView' => $this->faker->boolean, - 'accViewPass' => $this->faker->boolean, - 'accViewHistory' => $this->faker->boolean, - 'accEdit' => $this->faker->boolean, - 'accEditPass' => $this->faker->boolean, - 'accAdd' => $this->faker->boolean, - 'accDelete' => $this->faker->boolean, - 'accFiles' => $this->faker->boolean, - 'accPrivate' => $this->faker->boolean, - 'accPrivateGroup' => $this->faker->boolean, - 'accPermission' => $this->faker->boolean, - 'accPublicLinks' => $this->faker->boolean, - 'accGlobalSearch' => $this->faker->boolean, - 'configGeneral' => $this->faker->boolean, - 'configEncryption' => $this->faker->boolean, - 'configBackup' => $this->faker->boolean, - 'configImport' => $this->faker->boolean, - 'mgmUsers' => $this->faker->boolean, - 'mgmGroups' => $this->faker->boolean, - 'mgmProfiles' => $this->faker->boolean, - 'mgmCategories' => $this->faker->boolean, - 'mgmCustomers' => $this->faker->boolean, - 'mgmApiTokens' => $this->faker->boolean, - 'mgmPublicLinks' => $this->faker->boolean, - 'mgmAccounts' => $this->faker->boolean, - 'mgmTags' => $this->faker->boolean, - 'mgmFiles' => $this->faker->boolean, - 'mgmItemsPreset' => $this->faker->boolean, - 'evl' => $this->faker->boolean, - 'mgmCustomFields' => $this->faker->boolean, + 'accView' => $this->faker->boolean(), + 'accViewPass' => $this->faker->boolean(), + 'accViewHistory' => $this->faker->boolean(), + 'accEdit' => $this->faker->boolean(), + 'accEditPass' => $this->faker->boolean(), + 'accAdd' => $this->faker->boolean(), + 'accDelete' => $this->faker->boolean(), + 'accFiles' => $this->faker->boolean(), + 'accPrivate' => $this->faker->boolean(), + 'accPrivateGroup' => $this->faker->boolean(), + 'accPermission' => $this->faker->boolean(), + 'accPublicLinks' => $this->faker->boolean(), + 'accGlobalSearch' => $this->faker->boolean(), + 'configGeneral' => $this->faker->boolean(), + 'configEncryption' => $this->faker->boolean(), + 'configBackup' => $this->faker->boolean(), + 'configImport' => $this->faker->boolean(), + 'mgmUsers' => $this->faker->boolean(), + 'mgmGroups' => $this->faker->boolean(), + 'mgmProfiles' => $this->faker->boolean(), + 'mgmCategories' => $this->faker->boolean(), + 'mgmCustomers' => $this->faker->boolean(), + 'mgmApiTokens' => $this->faker->boolean(), + 'mgmPublicLinks' => $this->faker->boolean(), + 'mgmAccounts' => $this->faker->boolean(), + 'mgmTags' => $this->faker->boolean(), + 'mgmFiles' => $this->faker->boolean(), + 'mgmItemsPreset' => $this->faker->boolean(), + 'evl' => $this->faker->boolean(), + 'mgmCustomFields' => $this->faker->boolean(), ]; } } diff --git a/tests/SPT/Http/RequestTest.php b/tests/SPT/Http/RequestTest.php index d19687da..d1aef498 100644 --- a/tests/SPT/Http/RequestTest.php +++ b/tests/SPT/Http/RequestTest.php @@ -50,7 +50,6 @@ class RequestTest extends UnitaryTestCase private CryptPKIInterface|MockObject $cryptPKI; private HeaderDataCollection|MockObject $headers; private DataCollection $paramsGet; - private DataCollection $paramsPost; private DataCollection $server; private DataCollection $files; @@ -706,13 +705,6 @@ class RequestTest extends UnitaryTestCase */ public function testVerifySignatureWithoutHash() { - $params = [ - 'a' => 1, - 'b' => 2, - 'c' => 3 - ]; - $signature = Hash::signMessage(implode('&', $params), 'a_key'); - $this->ensureGet(); $this->kleinRequest->expects(self::never())->method('params'); @@ -807,11 +799,15 @@ class RequestTest extends UnitaryTestCase public function testGetSecureAppPath() { - $path = '../../opt/project/index.php'; + $path = sprintf( + '%s%s/index.php', + implode('', array_fill(0, count(explode('/', APP_ROOT)) - 1, '../')), + APP_ROOT + ); $out = Request::getSecureAppPath($path); - $this->assertEquals('/opt/project/index.php', $out); + $this->assertEquals(sprintf('%s/index.php', APP_ROOT), $out); } public function testGetSecureAppPathWithUnknownFile() @@ -859,10 +855,12 @@ class RequestTest extends UnitaryTestCase ->method('get') ->with( ... - self::withConsecutive(['Http-Forwarded'], - ['Http-Forwarded-Host'], - ['Http-Forwarded-Proto'], - ['Http-Forwarded']) + self::withConsecutive( + ['Http-Forwarded'], + ['Http-Forwarded-Host'], + ['Http-Forwarded-Proto'], + ['Http-Forwarded'] + ) ) ->willReturn('', $domain, 'https', 'for=10.10.10.10'); @@ -883,14 +881,17 @@ class RequestTest extends UnitaryTestCase ->method('get') ->with( ... - self::withConsecutive(['Http-Forwarded'], - ['Http-Forwarded-Host'], - ['Http-Forwarded-Proto']) + self::withConsecutive( + ['Http-Forwarded'], + ['Http-Forwarded-Host'], + ['Http-Forwarded-Proto'] + ) ) ->willReturn('', '', ''); $request = new Request($this->kleinRequest, $this->cryptPKI); + /** @noinspection HttpUrlsUsage */ $this->assertEquals(sprintf('http://%s', $domain), $request->getHttpHost()); } @@ -912,7 +913,11 @@ class RequestTest extends UnitaryTestCase public function testGetSecureAppFile() { - $path = '../../opt/project/index.php'; + $path = sprintf( + '%s%s/index.php', + implode('', array_fill(0, count(explode('/', APP_ROOT)) - 1, '../')), + APP_ROOT + ); $out = Request::getSecureAppFile($path); @@ -957,12 +962,12 @@ class RequestTest extends UnitaryTestCase ->method('paramsGet') ->willReturn($this->paramsGet); - $this->paramsPost = new DataCollection(); + $paramsPost = new DataCollection(); $this->kleinRequest ->expects(self::atMost(1)) ->method('paramsPost') - ->willReturn($this->paramsPost); + ->willReturn($paramsPost); $this->server = new DataCollection();