[#33028] - [4.0] Fix unresolved merge conflict from upmerge and adapt unit tests to upmerged security fixes
- Fixed in Code Base
- 6 Apr 2021
- Medium
- Build: 4.0-dev
- # 33028
- Diff
- richard67:4.0-dev-fix-merge-conflict-from-upmerge
User tests: Successful: Unsuccessful:
Pull Request for Issue 321def1#r49127384 .
Summary of Changes
-
In 4.0 the file
libraries/src/Encrypt/Randval.phphandled here has been completely renewed.
The recent upmerge of the changed copyright doc bloc has caused the conflict here. -
The unit tests need to be adapted to the upmerged security fix. See here in the big note: #32724 .
Testing Instructions
Code review and check that PHPCS passes in drone while it currently fails for the 4.0-dev branch.
Actual result BEFORE applying this Pull Request
Unresolved merge conflict. PHPCS failing and so unit tests are not started in the 4.0-dev branch.
Expected result AFTER applying this Pull Request
No unresolved merge conflict. PHPCS and unit tests passing here.
Documentation Changes Required
None.
| Status | New | ⇒ | Pending |
joomla-cms-bot
- | Category | ⇒ | Libraries |
| Labels |
Added:
?
|
||
| Category | Libraries | ⇒ | Libraries Unit Tests |
| Title |
|
||||||
| Labels |
Added:
?
|
||
API tests in drone failing to unrelated reasons. No idea how to fix those.
| Status | Pending | ⇒ | Fixed in Code Base |
| Closed_Date | 0000-00-00 00:00:00 | ⇒ | 2021-04-06 09:25:24 |
| Closed_By | ⇒ | wilsonge | |
| Labels |
Added:
?
Removed: ? |
||
Thanks!
Unit tests are failing now as PCPCS passes so the unit tests are started.
Reason is that the expected test results have to be adapted to the upmerged security fix from 3.9.25 and the later fix targeted for 3.9.26, as described here in the big note: #32724
Update: Have added fix for the unit tests to this PR here.