Skip to content
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.

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

PSR-2 Formatting #25

Merged
merged 2 commits into from
Jan 14, 2018
Merged

PSR-2 Formatting #25

merged 2 commits into from
Jan 14, 2018

Conversation

pmclain
Copy link
Contributor

@pmclain pmclain commented Jan 10, 2018

  • Correct PSR-2 linter errors and notices
  • Remove duplicate element in di.xml

Related to #22

@Ethan3600
Copy link
Owner

Can we remove the merge commits?

@pmclain
Copy link
Contributor Author

pmclain commented Jan 11, 2018

yup yup

@Ethan3600 Ethan3600 self-assigned this Jan 13, 2018
@Ethan3600
Copy link
Owner

Looks like we couldn't avoid the conflicts 😠

Patrick McLain added 2 commits January 14, 2018 08:48
Pretty much all indentation related.
@pmclain
Copy link
Contributor Author

pmclain commented Jan 14, 2018

@Ethan3600 I rebased to fix the conflicts

}
}

public function dispatchCron($jobId = null, $jobCode, $schedule = null)
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was the only remaining item picked up by the linter/sniffer I was using. Arguments with default values should be after required arguments, but it didn't look right to have the id after the job code. Any thoughts?

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree with you, the ID should take precedence. Let's let it slide this time.

@Ethan3600 Ethan3600 merged commit ec5852d into Ethan3600:1.x-develop Jan 14, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants