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

PhpUnitNoExpectationAnnotationFixer - fix "expectedException" annotation with message below #5690

Merged
merged 1 commit into from
Jul 29, 2021
Merged

PhpUnitNoExpectationAnnotationFixer - fix "expectedException" annotation with message below #5690

merged 1 commit into from
Jul 29, 2021

Conversation

@kubawerlos kubawerlos changed the base branch from 3.0 to 2.19 May 5, 2021 16:14
@kubawerlos kubawerlos marked this pull request as ready for review May 5, 2021 16:14
@kubawerlos kubawerlos added this to the 2.19.1 milestone May 5, 2021
@coveralls
Copy link

coveralls commented May 5, 2021

Coverage Status

Coverage increased (+0.001%) to 91.56% when pulling 35cabc5 on kubawerlos:fix_PhpUnitNoExpectationAnnotationFixer into 99375f3 on FriendsOfPHP:2.19.

class MyTest extends TestCase
{
/**
*/
Copy link
Member

Choose a reason for hiding this comment

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

we should keep the original Testing stuff. comment

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 is because DocBlock build annotation in as "everything from @ to next @ (or comment end)" - should I change it there or only in this fixer?

Copy link
Member

Choose a reason for hiding this comment

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

good point about annotation end.

then, let's use proper docblock in the test:

        /**
         * Testing stuff.
         *
         * @expectedException Foo\Bar
         */

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@keradus not really, this PR is about handling that case.

@keradus keradus modified the milestones: 2.19.1, 2.19.2 Jun 27, 2021
@keradus keradus modified the milestones: 2.19.2, 2.19.1 Jul 29, 2021
@keradus
Copy link
Member

keradus commented Jul 29, 2021

Thank you @kubawerlos.

@keradus keradus merged commit 1759995 into PHP-CS-Fixer:2.19 Jul 29, 2021
@kubawerlos kubawerlos deleted the fix_PhpUnitNoExpectationAnnotationFixer branch July 30, 2021 06:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants