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

Some fixes from PHPStan l2 #7136

Merged
merged 1 commit into from
Mar 20, 2018
Merged

Some fixes from PHPStan l2 #7136

merged 1 commit into from
Mar 20, 2018

Conversation

carusogabriel
Copy link
Contributor

I found an interesting one for our CS with this PR:

- /* @var Class $variable */
+ /** @var Class $variable */

/cc @Majkl578 @kukulich

@Ocramius
Copy link
Member

Yeah, phpstan set the standard for inline IDE hints there (before, /* and */ were to be used (see also https://netbeans.org/bugzilla/show_bug.cgi?id=267470)

@Ocramius Ocramius added this to the 3.0 milestone Mar 18, 2018
@Ocramius Ocramius self-assigned this Mar 18, 2018
@kukulich
Copy link

Hmm, there's already SlevomatCodingStandard.Commenting.InlineDocCommentDeclaration for the format of inline PHPDoc but it looks it should also check /*.

@Majkl578
Copy link
Contributor

Majkl578 commented Mar 18, 2018

I don't really think /* ... */ was ever supposed to be a phpDoc block. Correct is /** ... */ : https://docs.phpdoc.org/guides/docblocks.html#anatomy-of-a-docblock

Copy link
Contributor

@Majkl578 Majkl578 left a comment

Choose a reason for hiding this comment

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

Can we enable L2 on Travis too now?

composer.lock Outdated
@@ -294,12 +294,12 @@
"source": {
"type": "git",
"url": "https://github.com/doctrine/dbal.git",
"reference": "3c0bad37f41182de2b49ce5c4f8935ae7d808c81"
"reference": "e6e2eeab79a91c15be6431dcf334ea082b0f657b"
Copy link
Contributor

Choose a reason for hiding this comment

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

This bump looks unrelated.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Should I revert it?

Hate have .lock versioned, always do that 😅

Copy link
Member

Choose a reason for hiding this comment

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

Yes please: .lock should not be randomly changed, or else we don't know why build-related deps crash our builds.

Copy link
Contributor

@Majkl578 Majkl578 Mar 19, 2018

Choose a reason for hiding this comment

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

Probably, yes.
You can use the following to ignore any changes to composer.lock:

$ git update-index --assume-unchanged composer.lock

Then even if you run composer update and update dependencies, git will ignore that. ;)

To revert & track changes:

$ git update-index --no-assume-unchanged composer.lock

Copy link
Contributor Author

@carusogabriel carusogabriel Mar 20, 2018

Choose a reason for hiding this comment

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

@Ocramius @Majkl578 I'm learning more and more about Git every single day with you, thanks ❤️

I have reverted these changes, should be RTM :)

@carusogabriel
Copy link
Contributor Author

@Majkl578 No, there're many errors to be fixed for l2 😢

@Ocramius Ocramius dismissed Majkl578’s stale review March 20, 2018 09:26

Feedback handled

Copy link
Member

@Ocramius Ocramius left a comment

Choose a reason for hiding this comment

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

👍

@Ocramius Ocramius merged commit 41292e8 into doctrine:master Mar 20, 2018
@carusogabriel carusogabriel deleted the doctrine-cs branch March 20, 2018 14:39
@greg0ire greg0ire removed this from the 3.0.0 milestone Jun 27, 2021
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.

5 participants