Fix DSN detection in the IBM DB2 driver

[morozov]

Q	A
Type	bug, improvement
BC Break	no

Fixes #4065.

[morozov]

User credentials and driver options are passed to the driver both via individual parameters and as part of $params which is awkward:

dbal/src/Connection.php

Lines 352 to 356 in 48625f1

	$driverOptions = $this->params['driverOptions'] ?? [];
	$user = $this->params['user'] ?? null;
	$password = $this->params['password'] ?? null;
	$this->_conn = $this->_driver->connect($this->params, $user, $password, $driverOptions);

This can be improved by simplifying the signature of Driver::connect() to just Driver::connect(array $params) (a separate issue is to be filed). Once it's done, the lines above will be removed.

[codecov-commenter]

Codecov Report

Merging #4066 into 2.10.x will increase coverage by 0.08%.
The diff coverage is 96.29%.

@@             Coverage Diff              @@
##             2.10.x    #4066      +/-   ##
============================================
+ Coverage     73.30%   73.39%   +0.08%     
- Complexity     5031     5036       +5     
============================================
  Files           215      216       +1     
  Lines         12825    12838      +13     
============================================
+ Hits           9401     9422      +21     
+ Misses         3424     3416       -8     

Impacted Files	Coverage Δ	Complexity Δ
lib/Doctrine/DBAL/Driver/IBMDB2/DB2Driver.php	90.90% <87.50%> (+49.73%)	2.00 <0.00> (-4.00)	⬆️
lib/Doctrine/DBAL/Driver/IBMDB2/DataSourceName.php	100.00% <100.00%> (ø)	9.00 <9.00> (?)
lib/Doctrine/DBAL/Driver/PDOSqlsrv/Driver.php	88.88% <0.00%> (-3.71%)	13.00% <0.00%> (ø%)

---

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 3745877...747b042. Read the comment docs.

[greg0ire]

Let's document the possible keys with an array shape?

[morozov]

This method doesn't limit the keys that can be used.

[greg0ire]

Array shapes do not limit the keys that can be used either, it will allow you to document what keys are mandatory or optional and the type they should have if present.

[morozov]

So what will be the behavior if the key being passed is not mandatory or optional?

In this specific case, it's still a map of any string to any value that can be cast to a string. But instead of defining it as an array shape, I'd rather have an object/structure. If we don't do that soon, we may define an array shape later when bumping the Psalm level and it demands it. This way, we'll make sure that our type annotations are valid.

[greg0ire]

So what will be the behavior if the key being passed is not mandatory or optional?

Not the one I thought apparently… I could have sworn this was OK: https://psalm.dev/r/cd931bdda1

Sorry for polluting you with this nonsense 🤦

[morozov]

No worries. I wasn't sure about how Psalm works either, so now we're on the same page 👍