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.

Sign up for GitHub

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

Jump to bottom

Fix priority between PHPDoc return type fixers #3835

Merged
merged 2 commits into from Jul 4, 2018
Merged

Fix priority between PHPDoc return type fixers #3835

merged 2 commits into from Jul 4, 2018

Conversation

julienfalque
Copy link
Member

No description provided.

@julienfalque julienfalque added this to the 2.12.2 milestone Jun 21, 2018
@julienfalque julienfalque force-pushed the fix-phpdoc-return-type-fixers-priority branch from 1364398 to 1f5c3b1 Compare June 21, 2018 09:32
SpacePossum
SpacePossum reviewed Jun 21, 2018
View reviewed changes
tests/Fixtures/Integration/priority/phpdoc_to_return_type,no_superfluous_phpdoc_tags.test Outdated
*/
public function foo() {
}
}
Copy link
Contributor

Choose a reason for hiding this comment

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

maybe best to update to

/**
 * @return int
 */
public function foo() {
    return 1;
}

so when the fixer get updated to check if some is actually returned before fixing this test still works

Copy link
Member Author

Choose a reason for hiding this comment

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

Updated.

@julienfalque julienfalque force-pushed the fix-phpdoc-return-type-fixers-priority branch from 1f5c3b1 to 31d7f7a Compare June 21, 2018 10:09
@SpacePossum SpacePossum added the RTM Ready To Merge label Jun 21, 2018
@keradus
Copy link
Member

keradus commented Jun 21, 2018

sebastianbergmann/phpunit#3176 ...

@SpacePossum SpacePossum force-pushed the fix-phpdoc-return-type-fixers-priority branch from 53022a9 to 27f3cd6 Compare July 2, 2018 05:50
@SpacePossum SpacePossum force-pushed the fix-phpdoc-return-type-fixers-priority branch from 3a8503f to 082ed03 Compare July 4, 2018 06:42
@SpacePossum
Copy link
Contributor

Thanks @julienfalque.

@SpacePossum SpacePossum merged commit 082ed03 into PHP-CS-Fixer:2.12 Jul 4, 2018
SpacePossum added a commit that referenced this pull request Jul 4, 2018
@SpacePossum
bug #3835 Fix priority between PHPDoc return type fixers (julienfalqu…
a008ddb 
…e, keradus)

This PR was merged into the 2.12 branch.

Discussion
----------

Fix priority between PHPDoc return type fixers

Commits
-------

082ed03 Update composer.json
431f6c6 Fix priority between PHPDoc return type fixers
@SpacePossum SpacePossum removed the RTM Ready To Merge label Jul 4, 2018
@SpacePossum
Copy link
Contributor

thanks @keradus as well :)

@julienfalque julienfalque deleted the fix-phpdoc-return-type-fixers-priority branch July 4, 2018 09:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@SpacePossum SpacePossum SpacePossum approved these changes

Assignees
No one assigned
Labels
kind/bug
Projects
None yet
Milestone
2.12.2
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@julienfalque @keradus @SpacePossum