Skip to content

Simplify relative paths to webapp/vendor #2635

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 4 commits into from
Aug 3, 2024
Merged

Simplify relative paths to webapp/vendor #2635

merged 4 commits into from
Aug 3, 2024

Conversation

tom93
Copy link
Contributor

@tom93 tom93 commented Jul 29, 2024 •
edited
Loading

Continued from #2618 (comment).
Also fix a leftover reference to lib/vendor.
Also simplify an unrelated path in webapp/tests/*.

@tom93 tom93 mentioned this pull request Jul 29, 2024
Merged
tom93 added 3 commits July 29, 2024 10:43
@tom93
Fix leftover reference to lib/vendor
c0af459 
We missed it in commit ab267ec (Put lib/vendor close to the webapp,
2024-06-23).
@tom93
Simplify relative paths to webapp/vendor
c6d1064 
When the vendor directory was in lib/vendor, the relative paths from
within the webapp directory were "../lib/vendor". When lib/vendor was
moved to webapp/vendor in commit ab267ec (Put lib/vendor close to
the webapp, 2024-06-23), the relative paths were updated to
"../webapp/vendor". This commit simplifies the relative paths to just
"vendor" (since we are already in the webapp directory).
@tom93
Simplify relative symlink conversion
70c662e 
The string manipulation can be done in pure sh, there is no need for
grep and sed.
@tom93 tom93 force-pushed the pr/simplify-webapp-vendor-paths branch from cce4d1b to 70c662e Compare July 29, 2024 10:44
@tom93
Simplify relative path to webapp/public in webapp/tests/*
d641c25 
There is no need to repeat the common prefix "webapp/". In fact
earlier in the same file it was already using the simpler path.
@vmcj vmcj added this pull request to the merge queue Aug 3, 2024
Merged via the queue into DOMjudge:main with commit 597e622 Aug 3, 2024
26 checks passed
@sentry-io Sentry.io
Copy link

sentry-io bot commented Aug 3, 2024 •
edited
Loading

Suspect Issues

This pull request was deployed and Sentry observed the following issues:

  • ‼️ Doctrine\DBAL\Exception\UniqueConstraintViolationException: An exception occurred while executing a query: SQLSTATE[23000]: Integrity constraint violation: 1... /src/Service/DOMJudgeService.php in App\Service... View Issue
  • ‼️ Symfony\Component\HttpKernel\Exception\NotFoundHttpException: No route found for "GET https://www.domjudge.org/demoweb/doc/manual/" /public/index.php in ? View Issue
  • ‼️ Doctrine\DBAL\Exception\UniqueConstraintViolationException: An exception occurred while executing a query: SQLSTATE[23000]: Integrity constraint violation: 1... /src/Service/DOMJudgeService.php in App\Service... View Issue
  • ‼️ Doctrine\DBAL\Exception\UniqueConstraintViolationException: An exception occurred while executing a query: SQLSTATE[23000]: Integrity constraint violation: 1... /src/Controller/BaseController.php in App\Contr... View Issue
  • ‼️ Doctrine\DBAL\Exception\UniqueConstraintViolationException: An exception occurred while executing a query: SQLSTATE[23000]: Integrity constraint violation: 1... /src/Service/DOMJudgeService.php in App\Service... View Issue

Did you find this useful? React with a 👍 or 👎

@tom93 tom93 deleted the pr/simplify-webapp-vendor-paths branch August 3, 2024 09:33
@tom93
Copy link
Contributor Author

tom93 commented Aug 3, 2024 •
edited
Loading

I was playing with the web demo just before, not sure if it's related to the Sentry issue but thought I should mention anyway.
Steps: log in to demoweb (8.4.0DEV/c01749d0d) as admin, Configuration settings > Authentication > Auth methods: add "ipaddress", Save all changes.
Result: 500 Internal Server Error, An exception occurred while executing a query: SQLSTATE[23000]: Integrity constraint violation: 1062 Duplicate entry '8231-274' for key 'testcaseid'
I don't see how that exception could possibly be related to this patch.

@vmcj
Copy link
Member

vmcj commented Aug 3, 2024

I was playing with the web demo just before, not sure if it's related to the Sentry issue but thought I should mention anyway. Steps: log in to demoweb (8.4.0DEV/c01749d0d) as admin, Configuration settings > Authentication > Auth methods: add "ipaddress", Save all changes. Result: 500 Internal Server Error, An exception occurred while executing a query: SQLSTATE[23000]: Integrity constraint violation: 1062 Duplicate entry '8231-274' for key 'testcaseid' I don't see how that exception could possibly be related to this patch.

It is not, the dump in demoweb has some issues and we never take the time to create a new (proper) dump.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@vmcj vmcj vmcj approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@tom93 @vmcj