Clean up redundant annotations and dead code in tests

[BenMorel]

Q	A
Type	improvement
BC Break	no
Fixed issues	N/A

Summary

This PR:

• cleans up annotations that are:
  • useless because the variable does not exist: WriteTest
  • useless because the variable is assigned the return value of a properly documented function: BlobTest, DataAccessTest, MasterSlaveConnectionTest, ModifyLimitQueryTest, PortabilityTest
• cleans up an annotation + a variable that are unused: TypeConversionTest

[morozov]

This look like a non-breaking change. Would it make sense to target it to master? If you want to work further on code cleanup, please consider raising the PHPStan level first. This way, we'll get more consistent and automated fixes.

[BenMorel]

You're right, rebased on and retargeted to master. I'm too much focused on upcoming 3.0!

Can I be confident that master will always be merged into develop?
I'm more than happy to contribute to master, but want to be sure than my changes will end up in develop as well.

[morozov]

Can I be confident that master will always be merged into develop?

Yes. develop is based on master and is continuously rebased.

[morozov]

There seems to be more than that. If you search for a pattern like /\*\* @var \S+ \$ in the codebase on this branch, there will be 19 matches. By looking at the first 4, I can say that 3 of them can be removed:

1. dbal/lib/Doctrine/DBAL/Driver/IBMDB2/DB2Connection.php

   Lines 59 to 60 in 1cbadb3

   	/** @var stdClass $serverInfo */
   	$serverInfo = db2_server_info($this->conn);

2. dbal/lib/Doctrine/DBAL/Platforms/AbstractPlatform.php

   Lines 1552 to 1553 in e37fc54

   	foreach ($table->getColumns() as $column) {
   	/** @var Column $column */

3. dbal/lib/Doctrine/DBAL/Platforms/DrizzlePlatform.php

   Lines 506 to 511 in 423b03d

   	foreach ($diff->changedColumns as $columnDiff) {
   	if ($this->onSchemaAlterTableChangeColumn($columnDiff, $diff, $columnSql)) {
   	continue;
   	}
   	/** @var ColumnDiff $columnDiff */

I think we should address them all at once to create as little code-style noise as possible.

[BenMorel]

Good point, I've removed a lot more! 👍

[Ocramius]

🚢