Commit e547b84

committed

Merge remote-tracking branch 'origin/1.5.x' into 2.0.x

2 parents baf73e3 + 4a0d9cb commit e547b84Copy full SHA for e547b84

File tree

-8

lines changed

-8

lines changed

Lines changed: 1 addition & 1 deletion

Lines changed: 2 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -65,9 +65,6 @@ public function getTypeFromMethodCall(MethodReflection $methodReflection, Method`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`$resultClass = $this->getResultClass($driver);`
`68`		`- if ($resultClass === null) {`
`69`		`- return null;`
`70`		`- }`
`71`	`68`
`72`	`69`	`if (!$this->reflectionProvider->hasClass($resultClass)) {`
`73`	`70`	`return null;`
`@@ -86,9 +83,9 @@ public function getTypeFromMethodCall(MethodReflection $methodReflection, Method`
`86`	`83`
`87`	`84`	`/**`
`88`	`85`	`* @param DriverDetector::* $driver`
`89`		`- * @return class-string<DriverResult>\|null`
	`86`	`+ * @return class-string<DriverResult>`
`90`	`87`	`*/`
`91`		`- private function getResultClass(string $driver): ?string`
	`88`	`+ private function getResultClass(string $driver): string`
`92`	`89`	`{`
`93`	`90`	`switch ($driver) {`
`94`	`91`	`case DriverDetector::IBM_DB2:`
`@@ -110,8 +107,6 @@ private function getResultClass(string $driver): ?string`
`110`	`107`	`case DriverDetector::SQLSRV:`
`111`	`108`	`return 'Doctrine\DBAL\Driver\SQLSrv\Result';`
`112`	`109`	`}`
`113`		`-`
`114`		`- return null;`
`115`	`110`	`}`
`116`	`111`
`117`	`112`	`}`

Comments

(0)