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

Jump to bottom

Fix phpdoc #8074

Merged
merged 5 commits into from Mar 19, 2020
Merged

Fix phpdoc #8074

merged 5 commits into from Mar 19, 2020

Conversation

VincentLanglet
Copy link
Contributor

When running phpstan, I discover that an error was coming from a wrong phpDoc in these files.

greg0ire
greg0ire reviewed Mar 18, 2020
View reviewed changes
Copy link
Member

@greg0ire greg0ire left a comment

Choose a reason for hiding this comment

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

In case you are wondering what's up with phpcs, we have so many issues with cs on this project that checks are only enabled on PR diffs. That's why integer was ok before but isn't now.

lib/Doctrine/ORM/Query.php Outdated Show resolved Hide resolved
lib/Doctrine/ORM/QueryBuilder.php Outdated Show resolved Hide resolved
lib/Doctrine/ORM/QueryBuilder.php Outdated Show resolved Hide resolved
lib/Doctrine/ORM/QueryBuilder.php Outdated Show resolved Hide resolved
VincentLanglet and others added 4 commits March 19, 2020 01:44
@VincentLanglet @greg0ire
Update lib/Doctrine/ORM/Query.php
ebfffde 
Co-Authored-By: Grégoire Paris <postmaster@greg0ire.fr>
@VincentLanglet @greg0ire
Update lib/Doctrine/ORM/QueryBuilder.php
28af8ee 
Co-Authored-By: Grégoire Paris <postmaster@greg0ire.fr>
@VincentLanglet @greg0ire
Update lib/Doctrine/ORM/QueryBuilder.php
242909e 
Co-Authored-By: Grégoire Paris <postmaster@greg0ire.fr>
@VincentLanglet @greg0ire
Update lib/Doctrine/ORM/QueryBuilder.php
bcc3164 
Co-Authored-By: Grégoire Paris <postmaster@greg0ire.fr>
@VincentLanglet
Copy link
Contributor Author

@greg0ire Thanks

@greg0ire greg0ire merged commit dafe298 into doctrine:2.7 Mar 19, 2020
@greg0ire
Copy link
Member

Thanks @VincentLanglet !

@VincentLanglet VincentLanglet deleted the fixPhpdoc branch March 22, 2020 22:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@greg0ire greg0ire greg0ire approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@VincentLanglet @greg0ire