Skip to content

Use native intersection types in test suite #6312

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
merged 1 commit into from
Feb 21, 2024
Merged

Use native intersection types in test suite #6312

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 1 addition & 2 deletions tests/ConnectionTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,7 @@ protected function setUp(): void
$this->connection = DriverManager::getConnection(self::CONNECTION_PARAMS);
}

/** @return Connection&MockObject */
private function getExecuteStatementMockConnection(): Connection
private function getExecuteStatementMockConnection(): Connection&MockObject
{
$driverMock = $this->createMock(Driver::class);

Expand Down
3 changes: 1 addition & 2 deletions tests/Driver/AbstractDriverTestCase.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,7 @@ abstract protected function createSchemaManager(Connection $connection): Abstrac

abstract protected function createExceptionConverter(): ExceptionConverter;

/** @return Connection&MockObject */
protected function getConnectionMock(): Connection
protected function getConnectionMock(): Connection&MockObject
{
return $this->createMock(Connection::class);
}
Expand Down
4 changes: 1 addition & 3 deletions tests/Portability/StatementTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,7 @@
class StatementTest extends TestCase
{
protected Statement $stmt;

/** @var DriverStatement&MockObject */
protected DriverStatement $wrappedStmt;
protected DriverStatement&MockObject $wrappedStmt;

protected function setUp(): void
{
Expand Down
3 changes: 1 addition & 2 deletions tests/Query/QueryBuilderTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,7 @@
/** @psalm-import-type WrapperParameterTypeArray from Connection */
class QueryBuilderTest extends TestCase
{
/** @var Connection&MockObject */
protected Connection $conn;
protected Connection&MockObject $conn;

protected function setUp(): void
{
Expand Down
4 changes: 1 addition & 3 deletions tests/Tools/Console/RunSqlCommandTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,7 @@ class RunSqlCommandTest extends TestCase
{
private CommandTester $commandTester;
private RunSqlCommand $command;

/** @var Connection&MockObject */
private Connection $connectionMock;
private Connection&MockObject $connectionMock;

protected function setUp(): void
{
Expand Down
4 changes: 1 addition & 3 deletions tests/Types/BinaryTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,7 @@

class BinaryTest extends TestCase
{
/** @var AbstractPlatform&MockObject */
protected AbstractPlatform $platform;

protected AbstractPlatform&MockObject $platform;
protected BinaryType $type;

protected function setUp(): void
Expand Down
4 changes: 1 addition & 3 deletions tests/Types/BlobTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,7 @@

class BlobTest extends TestCase
{
/** @var AbstractPlatform&MockObject */
protected AbstractPlatform $platform;

protected AbstractPlatform&MockObject $platform;
protected BlobType $type;

protected function setUp(): void
Expand Down
4 changes: 1 addition & 3 deletions tests/Types/BooleanTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,7 @@

class BooleanTest extends TestCase
{
/** @var AbstractPlatform&MockObject */
private AbstractPlatform $platform;

private AbstractPlatform&MockObject $platform;
private BooleanType $type;

protected function setUp(): void
Expand Down
4 changes: 1 addition & 3 deletions tests/Types/DateImmutableTypeTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,7 @@

class DateImmutableTypeTest extends TestCase
{
/** @var AbstractPlatform&MockObject */
private AbstractPlatform $platform;

private AbstractPlatform&MockObject $platform;
private DateImmutableType $type;

protected function setUp(): void
Expand Down
4 changes: 1 addition & 3 deletions tests/Types/DateIntervalTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,7 @@

final class DateIntervalTest extends TestCase
{
/** @var AbstractPlatform&MockObject */
private AbstractPlatform $platform;

private AbstractPlatform&MockObject $platform;
private DateIntervalType $type;

protected function setUp(): void
Expand Down
4 changes: 1 addition & 3 deletions tests/Types/DateTimeImmutableTypeTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,7 @@

class DateTimeImmutableTypeTest extends TestCase
{
/** @var AbstractPlatform&MockObject */
private AbstractPlatform $platform;

private AbstractPlatform&MockObject $platform;
private DateTimeImmutableType $type;

protected function setUp(): void
Expand Down
4 changes: 1 addition & 3 deletions tests/Types/DateTimeTzImmutableTypeTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,7 @@

class DateTimeTzImmutableTypeTest extends TestCase
{
/** @var AbstractPlatform&MockObject */
private AbstractPlatform $platform;

private AbstractPlatform&MockObject $platform;
private DateTimeTzImmutableType $type;

protected function setUp(): void
Expand Down
4 changes: 1 addition & 3 deletions tests/Types/DecimalTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,7 @@

class DecimalTest extends TestCase
{
/** @var AbstractPlatform&MockObject */
private AbstractPlatform $platform;

private AbstractPlatform&MockObject $platform;
private DecimalType $type;

protected function setUp(): void
Expand Down
4 changes: 1 addition & 3 deletions tests/Types/FloatTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,7 @@

class FloatTest extends TestCase
{
/** @var AbstractPlatform&MockObject */
private AbstractPlatform $platform;

private AbstractPlatform&MockObject $platform;
private FloatType $type;

protected function setUp(): void
Expand Down
4 changes: 1 addition & 3 deletions tests/Types/GuidTypeTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,7 @@

class GuidTypeTest extends TestCase
{
/** @var AbstractPlatform&MockObject */
private AbstractPlatform $platform;

private AbstractPlatform&MockObject $platform;
private GuidType $type;

protected function setUp(): void
Expand Down
4 changes: 1 addition & 3 deletions tests/Types/IntegerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,7 @@

class IntegerTest extends TestCase
{
/** @var AbstractPlatform&MockObject */
private AbstractPlatform $platform;

private AbstractPlatform&MockObject $platform;
private IntegerType $type;

protected function setUp(): void
Expand Down
4 changes: 1 addition & 3 deletions tests/Types/JsonTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,7 @@

class JsonTest extends TestCase
{
/** @var AbstractPlatform&MockObject */
protected AbstractPlatform $platform;

protected AbstractPlatform&MockObject $platform;
protected JsonType $type;

protected function setUp(): void
Expand Down
4 changes: 1 addition & 3 deletions tests/Types/SmallIntTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,7 @@

class SmallIntTest extends TestCase
{
/** @var AbstractPlatform&MockObject */
private AbstractPlatform $platform;

private AbstractPlatform&MockObject $platform;
private SmallIntType $type;

protected function setUp(): void
Expand Down
4 changes: 1 addition & 3 deletions tests/Types/StringTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,7 @@

class StringTest extends TestCase
{
/** @var AbstractPlatform&MockObject */
private AbstractPlatform $platform;

private AbstractPlatform&MockObject $platform;
private StringType $type;

protected function setUp(): void
Expand Down
4 changes: 1 addition & 3 deletions tests/Types/TimeImmutableTypeTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,7 @@

class TimeImmutableTypeTest extends TestCase
{
/** @var AbstractPlatform&MockObject */
private AbstractPlatform $platform;

private AbstractPlatform&MockObject $platform;
private TimeImmutableType $type;

protected function setUp(): void
Expand Down
4 changes: 1 addition & 3 deletions tests/Types/VarDateTimeImmutableTypeTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,7 @@

class VarDateTimeImmutableTypeTest extends TestCase
{
/** @var AbstractPlatform&MockObject */
private AbstractPlatform $platform;

private AbstractPlatform&MockObject $platform;
private VarDateTimeImmutableType $type;

protected function setUp(): void
Expand Down
4 changes: 1 addition & 3 deletions tests/Types/VarDateTimeTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,7 @@

class VarDateTimeTest extends TestCase
{
/** @var AbstractPlatform&MockObject */
private AbstractPlatform $platform;

private AbstractPlatform&MockObject $platform;
private VarDateTimeType $type;

protected function setUp(): void
Expand Down