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

Remove phpunit-bridge specific annotations #3719

Merged
merged 1 commit into from
Nov 7, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 0 additions & 4 deletions tests/Doctrine/Tests/DBAL/Functional/PDOStatementTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,6 @@ protected function setUp() : void
$this->connection->getSchemaManager()->dropAndCreateTable($table);
}

/**
* @group legacy
Copy link
Member

Choose a reason for hiding this comment

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

@group is from PHPUnit, though.

Copy link
Member Author

Choose a reason for hiding this comment

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

Yeah, but legacy isn't.

Copy link
Member

Choose a reason for hiding this comment

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

I thought we were using that group to identify the tests we were going to drop eventually because of legacy 😆

Copy link
Member Author

Choose a reason for hiding this comment

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

Wouldn't be a bad idea, but right now I bet it's far from being exhaustive :P

* @expectedDeprecation Using a PDO fetch mode or their combination (%d given) is deprecated and will cause an error in Doctrine 3.0.
*/
public function testPDOSpecificModeIsAccepted() : void
{
$this->connection->insert('stmt_test', [
Expand Down
8 changes: 0 additions & 8 deletions tests/Doctrine/Tests/DBAL/Schema/ColumnTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -62,21 +62,13 @@ public function testToArray() : void
self::assertEquals($expected, $this->createColumn()->toArray());
}

/**
* @group legacy
* @expectedDeprecation The "unknown_option" column option is not supported, setting it is deprecated and will cause an error in Doctrine 3.0
*/
public function testSettingUnknownOptionIsStillSupported() : void
{
$this->expectNotToPerformAssertions();

new Column('foo', $this->createMock(Type::class), ['unknown_option' => 'bar']);
}

/**
* @group legacy
* @expectedDeprecation The "unknown_option" column option is not supported, setting it is deprecated and will cause an error in Doctrine 3.0
*/
public function testOptionsShouldNotBeIgnored() : void
{
$col1 = new Column('bar', Type::getType(Types::INTEGER), ['unknown_option' => 'bar', 'notnull' => true]);
Expand Down