Skip to content

[2.5] CS Fixes And Removed Unused Imports #12856

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

Merged
merged 1 commit into from Dec 5, 2014
Merged

[2.5] CS Fixes And Removed Unused Imports #12856

merged 1 commit into from Dec 5, 2014

Conversation

GrahamCampbell
Copy link
Contributor

Q A
Bug fix? no
New feature? no
BC breaks? no
Deprecations? no
Tests pass? yes
Fixed tickets N/A
License MIT
Doc PR N/A
This pull request fixes some cs issues in symfony 2.5.

I've applied the same set of fixes that I did to the 2.3 branch.

There are far fewer fixes than there were for 2.3, so I've just done them all at once.

@@ -653,7 +654,9 @@ protected function getSelectSecurityIdentityIdSql(SecurityIdentityInterface $sid
* Constructs the SQL to delete a security identity.
*
* @param SecurityIdentityInterface $sid
*
* @throws \InvalidArgumentException
Copy link
Member

Choose a reason for hiding this comment

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

I guess you could move @throws below @return.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

No, the standard seems to be to have param first, then throws, then return.

Symfony itself, is a tad inconsistent with this tbh.

@fabpot
Copy link
Member

fabpot commented Dec 5, 2014

Thank you @GrahamCampbell.

@fabpot fabpot merged commit ed4fb54 into symfony:2.5 Dec 5, 2014
fabpot added a commit that referenced this pull request Dec 5, 2014
This PR was merged into the 2.5 branch.

Discussion
----------

[2.5] CS Fixes And Removed Unused Imports

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | N/A
| License       | MIT
| Doc PR        | N/A

##### This pull request fixes some cs issues in symfony 2.5.

I've applied the same set of fixes that I did to the 2.3 branch.

There are far fewer fixes than there were for 2.3, so I've just done them all at once.

Commits
-------

ed4fb54 CS fixes
@GrahamCampbell GrahamCampbell deleted the 2.5-cs branch December 5, 2014 19:02
fabpot added a commit that referenced this pull request Dec 7, 2014
…ell)

This PR was squashed before being merged into the 2.6 branch (closes #12872).

Discussion
----------

[2.6] CS Fixes And Removed An Unused Import

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | N/A
| License       | MIT
| Doc PR        | N/A

##### This pull request fixes some cs issues in symfony 2.6.

This is the sequel to #12856.

Commits
-------

2f10a0a [2.6] CS Fixes And Removed An Unused Import
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants