[#40070] - [4.3] php-diff line endings
- Fixed in Code Base
- 12 Mar 2023
- Medium
- Build: 4.3-dev
- # 40070
- Diff
- brianteeman:differ
User tests: Successful: Unsuccessful:
Pull Request for Issue #40065 .
Summary of Changes
update php-diff from @jfcherng to force the diff to ignore line ending differences
Testing Instructions
@RickR2H please see if this solves your problem. I can't test it myself as I can't replicate the reported problem. But the logic of the change makles sense
Actual result BEFORE applying this Pull Request
Expected result AFTER applying this Pull Request
Link to documentations
Please select:
-
Documentation link for docs.joomla.org:
-
No documentation changes for docs.joomla.org needed
-
Pull Request link for manual.joomla.org:
-
No documentation changes for manual.joomla.org needed
| Status | New | ⇒ | Pending |
joomla-cms-bot
- | Category | ⇒ | Administration com_templates External Library Composer Change |
I have tested this item
This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/40070.
@brianteeman please remove the empty line. I'll reset the tests as it is only code style change.
This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/40070.
| Labels |
Added:
Composer Dependency Changed
PR-4.3-dev
|
||
| Status | Pending | ⇒ | Ready to Commit |
Restored tests because change was just an empty line removal.
RTC
This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/40070.
| Labels |
Added:
?
|
||
There is an issue with the composer lock file. Can you take a look, Brian @brianteeman? Thanks!
Fyi, php-diff just release 6.10.10. It shifts ignoreLineEnding's implementation to its dependency.
thanks for confirming. I will update this when I get back to my computer
I have tested this item
This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/40070.
I have tested this item
Works as expected.
This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/40070.
@obuisard The RTC label was not removed with the latest PR. But with two successful tests it's again RTC.
This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/40070.
| Status | Ready to Commit | ⇒ | Fixed in Code Base |
| Closed_Date | 0000-00-00 00:00:00 | ⇒ | 2023-03-12 12:39:15 |
| Closed_By | ⇒ | obuisard |
Thank you Brian @brianteeman
I have tested this item✅ successfully on aa78dca
Can be tested by changing the line ending of the override file from LF to CRLF and vise versa. @ricardo1709 please test!
This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/40070.