Skip to content

Commit 76859bc

Browse files
committed
Updates required laminas-db to target branch to include the new driver feature refactor code.
Signed-off-by: Joey Smith <jsmith@webinertia.net> Signed-off-by: Joey Smith <jsmith@webinertia.net>
1 parent 1a4a698 commit 76859bc

File tree

4 files changed

+50
-65
lines changed

4 files changed

+50
-65
lines changed

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
],
3838
"require": {
3939
"php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0",
40-
"laminas/laminas-db": "dev-adapter-migration-mysql-new"
40+
"laminas/laminas-db": "dev-adapter-migration-mysql-with-driver-feature"
4141
},
4242
"require-dev": {
4343
"ext-mysqli": "*",

composer.lock

Lines changed: 47 additions & 46 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Driver/Mysqli/Mysqli.php

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,6 @@ public function __construct(
5050
}
5151
}
5252

53-
/**
54-
* @return $this Provides a fluent interface
55-
*/
5653
public function setProfiler(ProfilerInterface $profiler): ProfilerAwareInterface
5754
{
5855
$this->profiler = $profiler;
@@ -72,8 +69,6 @@ public function getProfiler(): ?ProfilerInterface
7269

7370
/**
7471
* Register connection
75-
*
76-
* @return $this Provides a fluent interface
7772
* @deprecated as of 3.0.0, this method is no longer used.
7873
*/
7974
public function registerConnection(ConnectionInterface $connection): DriverInterface
@@ -149,9 +144,8 @@ public function createStatement($sqlOrResource = null): StatementInterface&State
149144
* Create result
150145
*
151146
* @param resource $resource
152-
* @param null|bool $isBuffered
153147
*/
154-
public function createResult($resource, $isBuffered = null): ResultInterface&Result
148+
public function createResult($resource, ?bool $isBuffered = null): ResultInterface&Result
155149
{
156150
/** @var Result $result */
157151
$result = clone $this->resultPrototype;
@@ -161,8 +155,6 @@ public function createResult($resource, $isBuffered = null): ResultInterface&Res
161155

162156
/**
163157
* Get prepare type
164-
*
165-
* @return string
166158
*/
167159
public function getPrepareType(): string
168160
{
@@ -171,20 +163,14 @@ public function getPrepareType(): string
171163

172164
/**
173165
* Format parameter name
174-
*
175-
* @param string $name
176-
* @param mixed $type
177-
* @return string
178166
*/
179-
public function formatParameterName($name, $type = null): string
167+
public function formatParameterName(string $name, ?string $type = null): string
180168
{
181169
return '?';
182170
}
183171

184172
/**
185173
* Get last generated value
186-
*
187-
* @return mixed
188174
*/
189175
public function getLastGeneratedValue(): int|string|null|false
190176
{

src/Driver/Pdo/Pdo.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@ class Pdo extends AbstractPdo
2323
{
2424
use DatabasePlatformNameTrait;
2525

26-
27-
2826
/**
2927
* @return $this Provides a fluent interface
3028
*/

0 commit comments

Comments
 (0)