Skip to content

Conversation

vargenau
Copy link
Contributor

@vargenau vargenau commented Oct 7, 2023

Description

PSR-12:

All PHP files MUST end with a non-blank line, terminated with a single LF.

The closing ?> tag MUST be omitted from files containing only PHP.

Changes

Remove closing ?> tag

Signed-off-by: Marc-Etienne Vargenau <[email protected]>
Signed-off-by: Marc-Etienne Vargenau <[email protected]>
Copy link
Member

@GMishx GMishx left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@GMishx
Copy link
Member

GMishx commented Oct 9, 2023

@vargenau Thank you for the contribution.
Can you please squash the 2 commits into 1 so we can merge this branch?

soham4abc and others added 4 commits October 9, 2023 12:32
Create endpoints for CX operations (email, ecc, keywords, etc.) and use
common functions in CopyrightController.

Signed-off-by: Gaurav Mishra <[email protected]>
Info on 88d04ec

BREAKING CHANGE: Response for
`/uploads/{id}/item/{itemId}/copyrights` endpoint
`#/components/schemas/GetFileCopyrights` parameter `copyright_count` is
 renamed to `count` to enable reusability by other CX endpoints.

Signed-off-by: Gaurav Mishra <[email protected]>
@GMishx
Copy link
Member

GMishx commented Oct 10, 2023

Hey @vargenau , looks like you've merged with master branch instead.

Please use git rebase -i master to rebase interactively and then squash the commits.

@github-actions github-actions bot added the has merge conflicts PR to be rebased label Oct 11, 2023
@github-actions
Copy link

This pull request has conflicts, please rebase with master to resolve those before we can evaluate the pull request.

@vargenau
Copy link
Contributor Author

Sorry, I created a mess when tying to squash.

I have created a new pull request #2599

Let us close this one.

@GMishx
Copy link
Member

GMishx commented Oct 11, 2023

Merged #2599, thus closing this PR.

@GMishx GMishx closed this Oct 11, 2023
@vargenau vargenau deleted the psr-12 branch October 11, 2023 11:47
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.

4 participants