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

Fix withNoArgs() to work with PHP 7.2 #646

Merged
merged 2 commits into from
Nov 29, 2016

Conversation

CyberiaResurrection
Copy link
Contributor

Simplest way I could think of of fixing #645 .

@coveralls
Copy link

Coverage Status

Coverage decreased (-0.05%) to 76.203% when pulling a765670 on CyberiaResurrection:master into 97f6ab1 on padraic:master.

@coveralls
Copy link

Coverage Status

Coverage decreased (-0.04%) to 76.215% when pulling a765670 on CyberiaResurrection:master into 97f6ab1 on padraic:master.

@@ -330,7 +330,8 @@ protected function _matchArg($expected, &$actual)
}
if (is_string($expected) && !is_array($actual) && !is_object($actual)) {
# push/pop an error handler here to to make sure no error/exception thrown if $expected is not a regex
set_error_handler(function () {});
set_error_handler(function () {
});
Copy link
Contributor

Choose a reason for hiding this comment

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

that makes no difference for php 7.2

Copy link
Contributor

Choose a reason for hiding this comment

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

ah, I see :)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I fixed it because styleCI complained, no other reason

@davedevelopment davedevelopment merged commit 2d1a89e into mockery:master Nov 29, 2016
@davedevelopment
Copy link
Collaborator

Thanks!

@c-harris
Copy link

I have rerun the travis project that tests this feature, and I am happy to report that this has resolved it.
https://travis-ci.org/Algo-Web/POData-Laravel/jobs/179722258

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants