? Failure

User tests: Successful: Unsuccessful:

avatar photodude
photodude
29 Jun 2017

Pull Request for Issue code style fixes

Summary of Changes

  • No blank line found after control structure
  • Please consider an empty line before the if statement;
  • Expected 1 space after "!="; 0 found
  • Expected 1 space after FUNCTION keyword; 0 found
  • No blank line found after control structure
  • Closing parenthesis of a multi-line function call must be on a line by itself
  • Object operator not indented correctly;
  • Please consider an empty line before the foreach statement;
  • Expected 0 spaces before opening parenthesis; 1 found
  • Multi-line function call not indented correctly;
  • Whitespace found at end of line

Automatically fixed with Joomla code standards 2.0.0 PHPCS2-alpha2 fixers

None of the manual only fixes have been applied

Testing Instructions

Merge by code review

Expected result

code style has been applied as listed above, old code style on drone does not error.

Actual result

code style had not been applied. Autofixers from the Joomla code standards 2.0.0 PHPCS2 alpha2 were used to impliment fixable codestyle

Documentation Changes Required

none

avatar photodude photodude - open - 29 Jun 2017
avatar photodude photodude - change - 29 Jun 2017
Status New Pending
avatar joomla-cms-bot joomla-cms-bot - change - 29 Jun 2017
Category Administration com_fields
avatar photodude photodude - change - 29 Jun 2017
The description was changed
avatar photodude photodude - edited - 29 Jun 2017
avatar brianteeman brianteeman - test_item - 30 Jul 2017 - Tested successfully
avatar brianteeman
brianteeman - comment - 30 Jul 2017

I have tested this item successfully on e20e96d


This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/16914.

avatar brianteeman
brianteeman - comment - 30 Jul 2017

@photodude can you fix the conflicts?

avatar zero-24
zero-24 - comment - 30 Jul 2017

are you sure that you can remove the new lines? As they come from the custom fields commit.? https://github.com/photodude/joomla-cms/blame/staging/administrator/components/com_fields/models/fields/type.php#L76

avatar photodude
photodude - comment - 12 Aug 2017

@zero-24 ugh, Seems something went wrong in fixing the merge conflicts here. I guess that's what I get for trying to get it done before vacation.

avatar zero-24
zero-24 - comment - 13 Aug 2017

ah Sorry @photodude i got confused because i have looked in your staging branch and not the joomla one ;)

I have also reboot travis so this should pass in a few minutes too.

avatar photodude
photodude - comment - 14 Aug 2017

Thank for restarting Travis @zero-24

avatar wilsonge
wilsonge - comment - 14 Aug 2017

Merging for now. But I think https://github.com/joomla/joomla-cms/pull/16914/files/61af4a0cc311194c31e613e3175c9768ad767b3c#diff-f7da601c0a51808627cf42d006fbe02a needs a bit of thought as although it is indeed compliant with the sniffer seems a bit odd. Maybe open it on the code style repo

avatar wilsonge wilsonge - change - 14 Aug 2017
Status Pending Fixed in Code Base
Closed_Date 0000-00-00 00:00:00 2017-08-14 00:45:31
Closed_By wilsonge
avatar wilsonge wilsonge - close - 14 Aug 2017
avatar wilsonge wilsonge - merge - 14 Aug 2017
avatar photodude
photodude - comment - 14 Aug 2017

Definitely an issue for the code style repo

Add a Comment

Login with GitHub to post a comment