Skip to content

Commit

Permalink
Merge branch '8.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
sebastianbergmann committed Jun 16, 2019
2 parents 7d1eefb + f9e3a01 commit 3e9a165
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/Framework/MockObject/Generator.php
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ public function getMockForTrait(string $traitName, array $arguments = [], string
*
* @throws RuntimeException
*/
public function getObjectForTrait(string $traitName, string $traitClassName = '', bool $callAutoload = true, bool $callOriginalConstructor, array $arguments = []): object
public function getObjectForTrait(string $traitName, string $traitClassName = '', bool $callAutoload = true, bool $callOriginalConstructor = false, array $arguments = []): object
{
if (!\trait_exists($traitName, $callAutoload)) {
throw new RuntimeException(
Expand Down

0 comments on commit 3e9a165

Please sign in to comment.