forwardport version compare for conflict resolve

[nabim777]

This PR is for resolving the conflict for branch master with branch release 2.7. That conflict was came due to this backport PR #720. In that backport PR only uses the getversion method instead of getversionstring, which was done is another file.

[github-actions]

JS Code Coverage

Coverage after merging forwardport-and-conflict-resolve into master will be

87.72%

Coverage Report

File	Stmts	Branches	Funcs	Lines	Uncovered Lines
src
adminSettings.js	0%	0%	0%	0%	1, 1, 10–19, 2, 20–25, 3–9
bootstrap.js	0%	0%	0%	0%	1, 1–7
dashboard.js	0%	0%	0%	0%	1, 1, 10–19, 2, 20–25, 3–9
fileActions.js	0%	0%	0%	0%	1, 1, 10–17, 2–9
personalSettings.js	0%	0%	0%	0%	1, 1, 10–19, 2, 20–25, 3–9
projectTab.js	0%	0%	0%	0%	1, 1, 10–19, 2, 20–29, 3, 30–39, 4, 40–49, 5, 50–59, 6, 60–66, 7–9
reference.js	0%	0%	0%	0%	1, 1, 10–19, 2, 20–29, 3, 30–39, 4, 40–49, 5, 50–59, 6, 60, 7–9
utils.js	71.43%	33.33%	50%	73.85%	10–14, 17–26, 6–9
src/components
AdminSettings.vue	96.16%	93.83%	95.16%	96.52%	1033–1036, 1072–1074, 1094–1097, 518–519, 655, 667–669, 681, 681, 681–686, 689–690, 694–695, 698–699, 703–704, 714–719, 779–781, 793–796, 809–811, 996–998
OAuthConnectButton.vue	91.54%	75%	100%	92.98%	59–64, 67–71
PersonalSettings.vue	90.16%	94.44%	85.71%	89.88%	100, 110–115, 118–127, 99
src/components/admin
FieldValue.vue	100%	100%	100%	100%
FormHeading.vue	100%	100%	100%	100%
ProjectFolderError.vue	100%	100%	100%	100%
TermsOfServiceUnsigned.vue	100%	100%	100%	100%
TextInput.vue	100%	100%	100%	100%
src/components/icons
ClippyIcon.vue	100%	100%	100%	100%
OpenProjectIcon.vue	100%	100%	100%	100%
src/components/settings
CheckBox.vue	100%	100%	100%	100%
SettingsTitle.vue	96.74%	85.71%	100%	97.53%	46–48
src/components/tab
EmptyContent.vue	97.22%	89.47%	100%	98.06%	92–96
SearchInput.vue	95.27%	92.96%	94.74%	95.73%	134–135, 188, 199–204, 263–265, 281–283, 287–292
WorkPackage.vue	86.07%	72.50%	93.33%	87.46%	102–111, 124–126, 137–141, 151–153, 171–177, 215, 215–220, 220, 220–231, 76–77
src/filesPlugin
filesPlugin.js	0%	0%	0%	0%	1, 1, 10, 100–104, 11–19, 2, 20–29, 3, 30–39, 4, 40–49, 5, 50–59, 6, 60–69, 7, 70–79, 8, 80–89, 9, 90–99
filesPluginLessThan28.js	0%	0%	0%	0%	1, 1, 10–19, 2, 20–29, 3, 30–39, 4, 40–49, 5, 50–59, 6, 60–69, 7, 70–78, 8–9
src/utils
workpackageHelper.js	89.72%	82.14%	88.89%	92.02%	153–154, 18–22, 29, 29, 31, 31, 45–47, 49, 49, 49–51, 94–99
src/views
CreateWorkPackageModal.vue	94.34%	86.54%	91.67%	95.50%	353–355, 358, 459–462, 467–472, 477–482, 488–491, 494, 510, 510, 550–554, 564–566, 585–587, 617–619, 641–643, 652–656
Dashboard.vue	77.40%	80.39%	61.90%	78.01%	103–108, 115, 119–120, 125, 128, 131–134, 139–141, 182–188, 194–197, 199–209, 238–246, 259–273, 51, 63, 88–91, 98–99
LinkMultipleFilesModal.vue	100%	100%	100%	100%
ProjectsTab.vue	94.91%	94.23%	93.33%	95.07%	113–116, 142, 153–154, 188–198, 246–248

[github-actions]

PHP Code Coverage

Coverage after merging forwardport-and-conflict-resolve into master will be

60.63%

Coverage Report

File	Stmts	Branches	Funcs	Lines	Uncovered Lines
server/apps/integration_openproject/lib
Capabilities.php	0%	100%	0%	0%	19, 26–35
ServerVersionHelper.php	0%	100%	0%	0%	17–18, 21, 24
server/apps/integration_openproject/lib/AppInfo
Application.php	7.41%	100%	25%	6%	101, 103–106, 108, 110, 112, 116–119, 121–132, 134, 137, 141, 145–147, 74–76, 79–83, 85–90, 92–93, 96
server/apps/integration_openproject/lib/BackgroundJob
RemoveExpiredDirectUploadTokens.php	0%	100%	0%	0%	42, 44–46, 55–56
server/apps/integration_openproject/lib/Controller
ConfigController.php	64.76%	100%	50%	65.37%	135, 152–153, 155, 157–159, 161–164, 167–168, 170, 212, 222, 226–228, 292–296, 406–408, 410–412, 417–420, 461, 549–552, 554–555, 558, 566–570, 581, 595–598, 606–607, 611–614, 628–632, 634–635, 637–653, 670–675, 677–678, 680–682, 685, 687–703, 716–723, 725–728, 730–734, 743–748
DirectDownloadController.php	0%	100%	0%	0%	36–38, 53–55, 57–64
DirectUploadController.php	70.83%	100%	100%	70%	141–143, 186–188, 199, 203–206, 208, 218, 225, 241–243, 245–246, 249–254, 257, 259, 267–269, 275–277, 285–287, 302–304, 323, 328, 334
FilesController.php	72.95%	100%	83.33%	72.41%	181–182, 244, 249–252, 254, 256–269, 272–273, 275–276, 280–283, 286, 292
OpenProjectAPIController.php	85.60%	100%	80%	85.92%	139, 180, 204, 230–233, 236–243, 245–249, 251, 263, 272, 290, 299, 369, 371, 421, 423, 443, 445, 492, 494, 520–523, 526–530, 532, 737–741, 96
server/apps/integration_openproject/lib/Dashboard
OpenProjectWidget.php	0%	100%	0%	0%	101, 108, 115–116, 118, 120–137, 69–73, 80, 87, 94
server/apps/integration_openproject/lib/Exception
OpenprojectAvatarErrorException.php	100%	100%	100%	100%
OpenprojectErrorException.php	100%	100%	100%	100%
OpenprojectFileNotUploadedException.php	100%	100%	100%	100%
OpenprojectGroupfolderSetupConflictException.php	100%	100%	100%	100%
OpenprojectResponseException.php	100%	100%	100%	100%
OpenprojectUnauthorizedUserException.php	0%	100%	0%	0%	16
server/apps/integration_openproject/lib/Listener
BeforeGroupDeletedListener.php	0%	100%	0%	0%	48, 56–57, 60–63, 65
BeforeNodeInsideOpenProjectGroupfilderChangedListener.php	0%	100%	0%	0%	41–43, 47–50, 52, 54, 57–58, 60, 62–65, 67–70, 72–74
BeforeUserDeletedListener.php	0%	100%	0%	0%	48, 55–56, 58–61, 63
LoadAdditionalScriptsListener.php	0%	100%	0%	0%	18–19, 21–23, 25
LoadSidebarScript.php	0%	100%	0%	0%	100, 102, 104–105, 107, 109, 111, 113–122, 75–91, 96–97, 99
OpenProjectReferenceListener.php	0%	100%	0%	0%	53–54, 57–58, 61–62, 64–67
TermsOfServiceEventListener.php	0%	100%	0%	0%	59–60, 65–66, 68–69, 71–73, 76–80
UserChangedListener.php	0%	100%	0%	0%	52, 59–60, 63–68, 71
server/apps/integration_openproject/lib/Migration
Version2001Date20221213083550.php	0%	100%	0%	0%	47, 57–65, 67–75, 77–79, 81
Version2310Date20230116153411.php	0%	100%	0%	0%	46, 49–52, 54–79, 81–82, 84
Version2400Date20230504144300.php	0%	100%	0%	0%	47, 57–60
Version2640Date20240628114301.php	0%	100%	0%	0%	52, 64–66, 69–70, 73
server/apps/integration_openproject/lib/Reference
WorkPackageReferenceProvider.php	51.67%	100%	25%	58.33%	102, 108–111, 114–116, 119, 123, 157, 165–166, 174, 52, 59, 66, 73–75
server/apps/integration_openproject/lib/Search
OpenProjectSearchProvider.php	0%	100%	0%	0%	103–104, 107–118, 121–122, 124–125, 128–137, 139–143, 66–69, 76, 83, 91, 93, 96
OpenProjectSearchResultEntry.php	100%	100%	100%	100%
server/apps/integration_openproject/lib/Service
DatabaseService.php	42.31%	100%	60%	40.43%	100–102, 125–129, 131, 80–93, 95–99
DirectDownloadService.php	88.46%	100%	100%	87.50%	65–66, 68
DirectUploadService.php	42.86%	100%	66.67%	40%	112, 118, 79–82, 84–92
OauthService.php	32.08%	100%	40%	31.25%	103–111, 122–129, 78–86, 88–94
OpenProjectAPIService.php	75.63%	100%	75.93%	75.60%	1035–1037, 1039–1041, 1044–1048, 1050–1052, 1061–1064, 1067–1069, 1071, 1074–1079, 1083–1084, 1115–1118, 1137–1144, 1153–1154, 1161–1163, 1165–1168, 1172, 1181, 1199, 1201–1204, 1206–1211, 1353, 1365, 1368, 1390, 1393, 1403–1408, 1533–1535, 1537–1538, 1542–1543, 1545, 1547,

[SagarGi]

LGTM 👍

[github-actions]

Hello there,
Thank you so much for taking the time and effort to create a pull request to our Nextcloud project.

We hope that the review process is going smooth and is helpful for you. We want to ensure your pull request is reviewed to your satisfaction. If you have a moment, our community management team would very much appreciate your feedback on your experience with this PR review process.

Your feedback is valuable to us as we continuously strive to improve our community developer experience. Please take a moment to complete our short survey by clicking on the following link: https://cloud.nextcloud.com/apps/forms/s/i9Ago4EQRZ7TWxjfmeEpPkf6

Thank you for contributing to Nextcloud and we hope to hear from you soon!

(If you believe you should not receive this message, you can add yourself to the blocklist.)