Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor(php):used expressions with combined operators #2685

Open
wants to merge 235 commits into
base: master
Choose a base branch
from

Conversation

Ibrahim-Muhammad13
Copy link

Description

Increase the usage of expressions with combined operators
this closes #2121

@Ibrahim-Muhammad13
Copy link
Author

@GMishx what can i do to get this merged?

@shaheemazmalmmd
Copy link
Contributor

@Ibrahim-Muhammad13 Please rebase the branch with master also consider changing the commit message as per https://github.com/fossology/fossology/blob/master/CHANGELOG.md

dushimsam and others added 24 commits February 20, 2024 22:11
Also prevent adding user to group using PUT request as POST request
already does that.

Signed-off-by: Gaurav Mishra <[email protected]>
Fix index creation commands to match values from DB, preventing recreation of indexes.
Separate licenses with or without obligations, fix license class to get
SPDXID.

Signed-off-by: Shaheem Azmal M MD <[email protected]>
1. Since RDF files are XML, putting unescaped text in
   `<spdx:attributionText>` can cause failures. To prevent, put text in
   `<![CDATA[ ]]>`
2. Prevent running build-test.yml on pushes other than `master` branch.
3. Add missing keyword other highlight.
4. Update workflows to use checkout v3.

Signed-off-by: Gaurav Mishra <[email protected]>
… jobs queued based on an upload

fix(API): /uploads/{id}/summary threw 500 error when returning the summary of an upload which was a file

Signed-off-by: Krishna Mahato <[email protected]>
Signed-off-by: Sanjay Krishna S R <[email protected]>

Feat(invertSearch):Removed unwanted changes

Signed-off-by: Sanjay Krishna S R <[email protected]>

feat(invertSearch):Added inverse search in Email/Url/Author Page

Signed-off-by: Sanjay Krishna S R <[email protected]>

abc

feat(inverseSearch):fixed alignments

Signed-off-by: Sanjay Krishna S R <[email protected]>
1. Remove import of old file.
2. Fix DbHelper::getFilenameFromUploadTree() to not cache
   query parameter.

Signed-off-by: Gaurav Mishra <[email protected]>
GMishx and others added 26 commits February 20, 2024 22:18
Update `composer/spdx-licenses` to latest version `1.5.8` to get latest
SPDX License list version 3.22

Signed-off-by: Gaurav Mishra <[email protected]>
1. Fix token generation for user page.
2. Fix error handling in user-edit.php
3. Fix the path `/users/token` to be authenticated.
4. Handle `user_edit` plugin exception in UserController.php

Signed-off-by: Gaurav Mishra <[email protected]>
Make the datatype of `rf_detector_type` consistent to int type from
string based on `src/cli/exportLicenseRefUsingSPDX.php`. This is helpful
for https://github.com/fossology/LicenseDb and anyother project trying
to read this file from typed programming language like Golang.

Signed-off-by: Gaurav Mishra <[email protected]>
Do not check page number 1 (which is the least value) if response list
is empty.

Signed-off-by: Gaurav Mishra <[email protected]>
Check if ScanOSS agent is installed before loading the data in View
page.

Signed-off-by: Gaurav Mishra <[email protected]>
…logy#2658)

fix(php) : Fix null pointer issue in createClearingDecisions()

Signed-off-by: Kgitman <[email protected]>

Reviewed-by: [email protected]
1. If a2ensite fails on postinstall, disable (delete) the old file first
2. Do not create files in site-enabled, rather in sites-available in
   `web/postinst`

Signed-off-by: Gaurav Mishra <[email protected]>
Use GroupID while fetching licenses in AjaxExplorer as OJO can create
candidate licenses since fossology#1887

Signed-off-by: Gaurav Mishra <[email protected]>
Create 2 consts:
1. SPDXREF_PREFIX = "LicenseRef-" to identify any LicenseRef
2. SPDXREF_PREFIX_FOSSOLOGY = "LicenseRef-fossology-" to add FOSSology's
   LicenseRef prefix.

Signed-off-by: Gaurav Mishra <[email protected]>
Signed-off-by: Gaurav Mishra <[email protected]>
Signed-off-by: Ibrahim Muhammad <[email protected]>
@github-actions github-actions bot removed the has merge conflicts PR to be rebased label Feb 20, 2024
@Ibrahim-Muhammad13
Copy link
Author

@shaheemazmalmmd i think i fixed the conflicts and passed tests but i don't know what to edit in the commit message i did it as explained in contribution guide

@shaheemazmalmmd
Copy link
Contributor

@Ibrahim-Muhammad13 I see that you have merged instead of rebase ? because of that morethan 200 commits got added to this PR. please have a look.

@GMishx
Copy link
Member

GMishx commented Apr 1, 2024

@Ibrahim-Muhammad13 can you please update the PR for us to merge it?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Increase the usage of expressions with combined operators