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

Update doctrine/coding-standard from 6.0.0 to 7.0.2 #514

Merged
merged 5 commits into from Jan 10, 2020
Merged

Update doctrine/coding-standard from 6.0.0 to 7.0.2 #514

merged 5 commits into from Jan 10, 2020

Conversation

Lctrs
Copy link
Contributor

@Lctrs Lctrs commented Jan 10, 2020

Closes #506.
Closes #507.
Closes #510.

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.

Overall very good: needs some adjustments due to previously imprecise /** @var */ annotations around mock objects

$sourceLocator = $this
->getMockBuilder(StringSourceLocator::class)
->disableOriginalConstructor()
->setMethods(['locateIdentifier'])
->getMock();
assert($sourceLocator instanceof StringSourceLocator || $sourceLocator instanceof MockObject);
Copy link
Member

Choose a reason for hiding this comment

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

Should be && for these transformations

$mockReflector = $this->createMock(Reflector::class);
assert($mockReflector instanceof Reflector || $mockReflector instanceof MockObject);
Copy link
Member

Choose a reason for hiding this comment

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

Since newer phpunit versions, we can drop these, since direct $this->createMock() calls (without builder) can be correctly inferred AFAIK

@Ocramius Ocramius added this to the 4.0.0 milestone Jan 10, 2020
@Ocramius
Copy link
Member

Build https://travis-ci.org/Roave/BetterReflection/jobs/635186981 failed due to too old phpunit version: we can bump the minimum supported version safely

@Lctrs
Copy link
Contributor Author

Lctrs commented Jan 10, 2020

🤞

@Ocramius
Copy link
Member

Fatal error:  Allowed memory size of 1073741824 bytes exhausted (tried to allocate 266240 bytes) in phar:///home/travis/build/Roave/BetterReflection/vendor/phpstan/phpstan/phpstan/vendor/ondrejmirtes/better-reflection/src/Reflector/Exception/IdentifierNotFound.php on line 24

LULZ

CS is good though, so I would merge this as-is, and bring the new problem with me as a separate issue.

@Ocramius Ocramius self-assigned this Jan 10, 2020
@Ocramius Ocramius merged commit 4f9e408 into Roave:master Jan 10, 2020
@Lctrs Lctrs deleted the bump-cs branch January 10, 2020 12:04
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.

None yet

2 participants