Skip to content

Fix namespace for Generator in PHPUnit >= 10.3 #42

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.

Sign up for GitHub

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

Merged
Naktibalda merged 2 commits into from
Aug 16, 2023
Merged

Fix namespace for Generator in PHPUnit >= 10.3 #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5b9253c
Fix namespace for Generator in PHPUnit >= 10.3
W0rma Aug 7, 2023
6153a58
Remove unused method
W0rma Aug 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions src/Stub.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
use Codeception\Stub\StubMarshaler;
use Exception;
use LogicException;
use PHPUnit\Framework\MockObject\Generator;
use PHPUnit\Framework\MockObject\Generator as LegacyGenerator;
use PHPUnit\Framework\MockObject\Generator\Generator;
use PHPUnit\Framework\MockObject\MockObject as PHPUnitMockObject;
use PHPUnit\Framework\MockObject\Rule\AnyInvokedCount;
use PHPUnit\Framework\MockObject\Stub\ConsecutiveCalls;
Expand Down Expand Up @@ -433,7 +434,12 @@ private static function doGenerateMock($args, $isAbstract = false)
{
$testCase = self::extractTestCaseFromArgs($args);
$methodName = $isAbstract ? 'getMockForAbstractClass' : 'getMock';
$generatorClass = new Generator;
// PHPUnit 10.3 changed the namespace
if (version_compare(PHPUnitVersion::series(), '10.3', '>=')) {
$generatorClass = new Generator();
} else {
$generatorClass = new LegacyGenerator();
}

// using PHPUnit 5.4 mocks registration
if (version_compare(PHPUnitVersion::series(), '5.4', '>=')
Expand Down
6 changes: 0 additions & 6 deletions tests/StubTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -387,12 +387,6 @@ public function testStubMakeEmptyInterface()
$stub = Stub::makeEmpty(Countable::class, ['count' => 5]);
$this->assertEquals(5, $stub->count());
}

private function assertObjectHasProperty(string $propertyName, object $object): void
{
$hasProperty = (new ReflectionObject($object))->hasProperty($propertyName);
$this->assertTrue($hasProperty, sprintf("Object has no attribute %s", $propertyName));
}
}

class MyClassWithPrivateProperties
Expand Down