[#6323] - Removed a few nested conditionals in the JFormField base class
- Closed
- 29 Sep 2015
- Medium
- Build: staging
- # 6323
- Diff
- Mathewlenning:Form-Field-Cleaning
- Success The Travis CI build passed Details
User tests: Successful: Unsuccessful:
I think I have the code style setting working now. We're about to find out. After talking to @mbabker on twitter, I decided to do a little more cleaning. This time I removed nested conditionals from getFieldName and getAttributes
joomla-cms-bot
- | Labels |
Added:
?
|
||
zero-24
- | Category | ⇒ | Code style Libraries |
@Mathewlenning Compare this part https://github.com/Mathewlenning/joomla-cms/blob/Form-Field-Cleaning/libraries/joomla/form/field.php#L908-L915 with a file from staging
Truthfully, using the web UI there isn't. When merge conflicts happen it's best to merge the upstream branch into your local branch and git will tell you what lines in what files are conflicted.
@Mathewlenning I think you need to do the following (with PhpStorm):
go to VCS->Git->Branches
and merge the Joomla/Stagging to your current repo
I tried that, but it said that it was up-to-date. I think I'm just going to close this PR and redo it on a new branch. The changes were really simple, so it will only take a second.
| Status | Pending | ⇒ | Closed |
| Closed_Date | 0000-00-00 00:00:00 | ⇒ | 2015-09-29 11:48:26 |
| Closed_By | ⇒ | Mathewlenning |
I hate it when a PR goes out of sync. Anyone that can see the conflicts care to show me what they are? All I can see is a "Only those with write access to this repository can merge pull requests" message. No other hints as to what is out of sync.