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

CS: correct annotation types to use symbols specified in the CS rules #2999

Merged
merged 1 commit into from
Jan 29, 2018
Merged

CS: correct annotation types to use symbols specified in the CS rules #2999

merged 1 commit into from
Jan 29, 2018

Conversation

carusogabriel
Copy link
Contributor

@carusogabriel carusogabriel commented Jan 29, 2018

As requested by @morozov in #2996

Copy link
Member

@morozov morozov left a comment

Choose a reason for hiding this comment

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

Thank you @carusogabriel! Please see a couple alignment issues in comments.

@@ -356,7 +356,7 @@ public function getExpressionBuilder()
/**
* Establishes the connection with the database.
*
* @return boolean TRUE if the connection was successfully established, FALSE if
* @return bool TRUE if the connection was successfully established, FALSE if
* the connection is already open.
Copy link
Member

Choose a reason for hiding this comment

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

This one should be also moved 3 chars left.

* @param integer|boolean $startPos Position to start at, beginning of string by default.
* @param string $str Literal string.
* @param string $substr Literal string to find.
* @param int|bool $startPos Position to start at, beginning of string by default.
Copy link
Member

Choose a reason for hiding this comment

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

Please fix alignment.

Copy link
Contributor Author

@carusogabriel carusogabriel Jan 29, 2018

Choose a reason for hiding this comment

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

I'm getting an error locally:

FILE: lib/Doctrine/DBAL/Platforms/AbstractPlatform.php
----------------------------------------------------------------------
FOUND 1 ERROR AFFECTING 1 LINE
----------------------------------------------------------------------
 858 | ERROR | [x] Expected 1 spaces after parameter type; 4 found
----------------------------------------------------------------------
PHPCBF CAN FIX THE 1 MARKED SNIFF VIOLATIONS AUTOMATICALLY
----------------------------------------------------------------------

And is not allow me to commit 😥

Copy link
Contributor

Choose a reason for hiding this comment

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

You should un-indent the $str and $substr params.

@Ocramius
Copy link
Member

🚢 (CI failure is a timeout in @travis-ci setting up the services)

@Ocramius Ocramius merged commit 122d4ad into doctrine:master Jan 29, 2018
@Ocramius Ocramius changed the title Fix annotation types CS: correct annotation types to use symbols specified in the CS rules Jan 29, 2018
@carusogabriel carusogabriel deleted the annotation-types branch January 29, 2018 06:49
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Aug 13, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants