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.

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

Use PHPUnit 10 #335

Merged
merged 6 commits into from
Nov 4, 2024
Merged

Use PHPUnit 10 #335

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
788bb08
Bump PHPUnit version to 10.5
W0rma Oct 31, 2024
79b4cc4
Rename abstract test class to not execute this class as test
W0rma Oct 31, 2024
d36784c
Fix data provider deprecations in PHPUnit 10.5
W0rma Oct 31, 2024
90a1a82
Fix method name but keep compatibility with Twig < 3.13
W0rma Oct 31, 2024
ea28741
Test against latest pagerfanta version
W0rma Oct 31, 2024
0d627b4
Fix test
W0rma Oct 31, 2024
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
Prev Previous commit
Next Next commit
Fix data provider deprecations in PHPUnit 10.5
  • Loading branch information
@W0rma
W0rma committed Nov 1, 2024
commit d36784cb2def06eca291e1e26a299ebcd5d943c3
7 changes: 3 additions & 4 deletions tests/Hateoas/Tests/HateoasBuilderTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
use Hateoas\UrlGenerator\CallableUrlGenerator;
use JMS\Serializer\SerializationContext;
use JMS\Serializer\SerializerInterface;
use PHPUnit\Framework\Attributes\DataProvider;

/**
* Contains functional tests
Expand All @@ -29,9 +30,7 @@ public function testBuild()
$this->assertInstanceOf(SerializerInterface::class, $hateoas);
}

/**
* @dataProvider getTestSerializeAdrienBraultWithExclusionData
*/
#[DataProvider('getTestSerializeAdrienBraultWithExclusionData')]
public function testSerializeAdrienBraultWithExclusion($adrienBrault, $fakeAdrienBrault)
{
$hateoas = HateoasBuilder::buildHateoas();
Expand Down Expand Up @@ -71,7 +70,7 @@ public function testSerializeAdrienBraultWithExclusion($adrienBrault, $fakeAdrie
);
}

private static function getTestSerializeAdrienBraultWithExclusionData(): iterable
public static function getTestSerializeAdrienBraultWithExclusionData(): iterable
{
yield [
new Attribute\AdrienBrault(),
Expand Down
28 changes: 13 additions & 15 deletions tests/Hateoas/Tests/Representation/CollectionRepresentationTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,11 @@
namespace Hateoas\Tests\Representation;

use Hateoas\Representation\CollectionRepresentation;
use PHPUnit\Framework\Attributes\DataProvider;

class CollectionRepresentationTest extends RepresentationTestCase
{
/**
* @dataProvider getTestSerializeData
*/
#[DataProvider('getTestSerializeData')]
public function testSerialize($resources)
{
$collection = new CollectionRepresentation($resources);
Expand Down Expand Up @@ -58,21 +57,20 @@ public function testSerialize($resources)
);
}

public function getTestSerializeData()
public static function getTestSerializeData(): iterable
{
return [
yield [
[
[
'Adrien',
'William',
],
],
[
new \ArrayIterator([
'Adrien',
'William',
]),
'Adrien',
'William',
],
];

yield [
new \ArrayIterator([
'Adrien',
'William',
]),
];
}
}
13 changes: 5 additions & 8 deletions tests/Hateoas/Tests/Serializer/ExclusionManagerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
use JMS\Serializer\SerializationContext;
use JMS\Serializer\Visitor\SerializationVisitorInterface;
use Metadata\MetadataFactoryInterface;
use PHPUnit\Framework\Attributes\DataProvider;
use Prophecy\Argument;
use Prophecy\PhpUnit\ProphecyTrait;
use Symfony\Component\ExpressionLanguage\ExpressionLanguage;
Expand Down Expand Up @@ -107,9 +108,7 @@ public function testSkipEmbedded()
$this->assertTrue($exclusionManager->shouldSkipEmbedded($object, $relation, $context));
}

/**
* @dataProvider getTestSkipExcludeIfData
*/
#[DataProvider('getTestSkipExcludeIfData')]
public function testSkipExcludeIf($exclude)
{
$object = (object) ['name' => 'adrien'];
Expand All @@ -136,12 +135,10 @@ public function testSkipExcludeIf($exclude)
$this->assertSame($exclude, $exclusionManager->shouldSkipEmbedded($object, $relation, $context));
}

public function getTestSkipExcludeIfData()
public static function getTestSkipExcludeIfData(): iterable
{
return [
[true],
[false],
];
yield [true];
yield [false];
}

/**
Expand Down